Improved body scanning, increased length

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 6c63753d9114de8f9dd8b412a204c24795822744..6c02c4f8431087bf5d13cb3f5f3317dc3d7b3b86 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -501,13 +501,6 @@ function networkThreadedView(App $a, $update, $parent)
                $tabs = network_tabs($a);
                $o .= $tabs;
 
-               if ($gid && ($t = Contact::getOStatusCountByGroupId($gid)) && !DI::pConfig()->get(local_user(), 'system', 'nowarn_insecure')) {
-                       notice(DI::l10n()->tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
-                               "Warning: This group contains %s members from a network that doesn't allow non public messages.",
-                               $t) . EOL);
-                       notice(DI::l10n()->t("Messages in this group won't be send to these receivers.").EOL);
-               }
-
                Nav::setSelected('network');
 
                $content = '';
@@ -621,10 +614,6 @@ function networkThreadedView(App $a, $update, $parent)
                                'contacts' => $entries,
                                'id' => 'network',
                        ]) . $o;
-
-                       if ($contact['network'] === Protocol::OSTATUS && $contact['writable'] && !DI::pConfig()->get(local_user(),'system','nowarn_insecure')) {
-                               notice(DI::l10n()->t('Private messages to this person are at risk of public disclosure.') . EOL);
-                       }
                } else {
                        notice(DI::l10n()->t('Invalid contact.') . EOL);
                        DI::baseUrl()->redirect('network');
@@ -804,7 +793,7 @@ function networkThreadedView(App $a, $update, $parent)
                        STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
                        WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? AND `item`.`gravity` = ?
                                AND NOT `author`.`hidden` AND NOT `author`.`blocked`" . $sql_tag_nets,
-                       local_user(), TERM_OBJ_POST, TERM_HASHTAG,
+                       local_user(), Term::OBJECT_TYPE_POST, Term::HASHTAG,
                        $top_limit, $bottom_limit, GRAVITY_PARENT);
 
                $data = DBA::toArray($items);