Merge pull request #8322 from nupplaphil/task/move_namespace_test

[friendica.git] / src / Module / Search / Index.php

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index ca5f7b609100612a2d23fadd27bbc270f9e74184..44407623e9704e19aea77c40f8f923792af8e633 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module\Search;
 
@@ -7,7 +26,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -16,35 +34,35 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Term;
-use Friendica\Module\BaseSearchModule;
+use Friendica\Module\BaseSearch;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Strings;
 
-class Index extends BaseSearchModule
+class Index extends BaseSearch
 {
        public static function content(array $parameters = [])
        {
                $search = (!empty($_GET['q']) ? Strings::escapeTags(trim(rawurldecode($_GET['q']))) : '');
 
-               if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
+               if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
                }
 
-               if (Config::get('system', 'local_search') && !Session::isAuthenticated()) {
+               if (DI::config()->get('system', 'local_search') && !Session::isAuthenticated()) {
                        $e = new HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a search.'));
                        $e->httpdesc = DI::l10n()->t('Public access denied.');
                        throw $e;
                }
 
-               if (Config::get('system', 'permit_crawling') && !Session::isAuthenticated()) {
+               if (DI::config()->get('system', 'permit_crawling') && !Session::isAuthenticated()) {
                        // Default values:
                        // 10 requests are "free", after the 11th only a call per minute is allowed
 
-                       $free_crawls = intval(Config::get('system', 'free_crawls'));
+                       $free_crawls = intval(DI::config()->get('system', 'free_crawls'));
                        if ($free_crawls == 0)
                                $free_crawls = 10;
 
-                       $crawl_permit_period = intval(Config::get('system', 'crawl_permit_period'));
+                       $crawl_permit_period = intval(DI::config()->get('system', 'crawl_permit_period'));
                        if ($crawl_permit_period == 0)
                                $crawl_permit_period = 10;
 
@@ -112,14 +130,22 @@ class Index extends BaseSearchModule
                        }
                }
 
-               $tag = $tag || Config::get('system', 'only_tag_search');
+               $tag = $tag || DI::config()->get('system', 'only_tag_search');
 
                // Here is the way permissions work in the search module...
                // Only public posts can be shown
                // OR your own posts if you are a logged in member
                // No items will be shown if the member has a blocked profile wall.
 
-               $pager = new Pager(DI::args()->getQueryString());
+               if (DI::mode()->isMobile()) {
+                       $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+                               DI::config()->get('system', 'itemspage_network_mobile'));
+               } else {
+                       $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+                               DI::config()->get('system', 'itemspage_network'));
+               }
+
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
                if ($tag) {
                        Logger::info('Start tag search.', ['q' => $search]);
@@ -182,7 +208,7 @@ class Index extends BaseSearchModule
 
                Logger::info('Start Conversation.', ['q' => $search]);
 
-               $o .= conversation(DI::app(), $r, $pager, 'search', false, false, 'commented', local_user());
+               $o .= conversation(DI::app(), $r, 'search', false, false, 'commented', local_user());
 
                $o .= $pager->renderMinimal(count($r));