Merge pull request #8632 from annando/fix-fatal

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 1f7afebf37c243beea9e680be00b472d367e1ba6..1506c707377fa196842c007aa462779a5ffe2741 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -37,8 +37,8 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\Post\Category;
 use Friendica\Model\Profile;
-use Friendica\Model\Term;
 use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -228,14 +228,12 @@ function networkPager(App $a, Pager $pager, $update)
                return ' LIMIT 100';
        }
 
-       //  check if we serve a mobile device and get the user settings
-       //  accordingly
        if (DI::mode()->isMobile()) {
-               $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network');
-               $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
+               $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+                       DI::config()->get('system', 'itemspage_network_mobile'));
        } else {
-               $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network');
-               $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+               $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+                       DI::config()->get('system', 'itemspage_network'));
        }
 
        //  now that we have the user settings, see if the theme forces
@@ -291,7 +289,7 @@ function networkConversation(App $a, $items, Pager $pager, $mode, $update, $orde
                $items = [];
        }
 
-       $o = conversation($a, $items, $pager, $mode, $update, false, $ordering, local_user());
+       $o = conversation($a, $items, $mode, $update, false, $ordering, local_user());
 
        if (!$update) {
                if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
@@ -377,29 +375,29 @@ function networkFlatView(App $a, $update = 0)
                }
        }
 
-       $pager = new Pager(DI::args()->getQueryString());
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
        networkPager($a, $pager, $update);
 
-       $item_params = ['order' => ['id' => true]];
 
        if (strlen($file)) {
-               $term_condition = ["`term` = ? AND `otype` = ? AND `type` = ? AND `uid` = ?",
-                       $file, Term::OBJECT_TYPE_POST, Term::FILE, local_user()];
-               $term_params = ['order' => ['tid' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
-               $result = DBA::select('term', ['oid'], $term_condition, $term_params);
+               $item_params = ['order' => ['uri-id' => true]];
+               $term_condition = ['name' => $file, 'type' => Category::FILE, 'uid' => local_user()];
+               $term_params = ['order' => ['uri-id' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+               $result = DBA::select('category-view', ['uri-id'], $term_condition, $term_params);
 
                $posts = [];
                while ($term = DBA::fetch($result)) {
-                       $posts[] = $term['oid'];
+                       $posts[] = $term['uri-id'];
                }
                DBA::close($result);
 
                if (count($posts) == 0) {
                        return '';
                }
-               $item_condition = ['uid' => local_user(), 'id' => $posts];
+               $item_condition = ['uid' => local_user(), 'uri-id' => $posts];
        } else {
+               $item_params = ['order' => ['id' => true]];
                $item_condition = ['uid' => local_user()];
                $item_params['limit'] = [$pager->getStart(), $pager->getItemsPerPage()];
 
@@ -503,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 = '';
@@ -623,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');
@@ -669,7 +656,7 @@ function networkThreadedView(App $a, $update, $parent)
                $sql_range = '';
        }
 
-       $pager = new Pager(DI::args()->getQueryString());
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
        $pager_sql = networkPager($a, $pager, $update);
 
@@ -800,14 +787,13 @@ function networkThreadedView(App $a, $update, $parent)
                }
 
                $items = DBA::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date`, `author`.`url` AS `author-link` FROM `item`
-                       STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
-                               (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
-                       ON `item`.`id` = `term`.`oid`
+                       STRAIGHT_JOIN (SELECT `uri-id` FROM `tag-search-view` WHERE `name` IN
+                               (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `uid` = 0) AS `tag-search`
+                       ON `item`.`uri-id` = `tag-search`.`uri-id`
                        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,
-                       $top_limit, $bottom_limit, GRAVITY_PARENT);
+                       local_user(), $top_limit, $bottom_limit, GRAVITY_PARENT);
 
                $data = DBA::toArray($items);