Merge pull request #12028 from annando/no-boot-src-module-4

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

diff --git a/src/Module/Search/Filed.php b/src/Module/Search/Filed.php
index f5ec0d70f16be647f14d0eaaebb446462fb61344..5f3c30f9baa9cedacf057b29b66b3112d84b541f 100644 (file)
--- a/src/Module/Search/Filed.php
+++ b/src/Module/Search/Filed.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @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,6 +26,7 @@ use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
@@ -17,15 +37,15 @@ use Friendica\Module\Security\Login;
 
 class Filed extends BaseSearch
 {
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
-               if (!local_user()) {
+               if (!Session::getLocalUser()) {
                        return Login::form();
                }
 
                DI::page()['aside'] .= Widget::fileAs(DI::args()->getCommand(), $_GET['file'] ?? '');
 
-               if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll') && ($_GET['mode'] ?? '') != 'minimal') {
+               if (DI::pConfig()->get(Session::getLocalUser(), 'system', 'infinite_scroll') && ($_GET['mode'] ?? '') != 'minimal') {
                        $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
                        $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
                } else {
@@ -40,10 +60,10 @@ class Filed extends BaseSearch
                }
 
                if (DI::mode()->isMobile()) {
-                       $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+                       $itemspage_network = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_mobile_network',
                                DI::config()->get('system', 'itemspage_network_mobile'));
                } else {
-                       $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+                       $itemspage_network = DI::pConfig()->get(Session::getLocalUser(), 'system', 'itemspage_network',
                                DI::config()->get('system', 'itemspage_network'));
                }
 
@@ -51,7 +71,7 @@ class Filed extends BaseSearch
 
                $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemspage_network);
 
-               $term_condition = ['type' => Category::FILE, 'uid' => local_user()];
+               $term_condition = ['type' => Category::FILE, 'uid' => Session::getLocalUser()];
                if ($file) {
                        $term_condition['name'] = $file;
                }
@@ -74,14 +94,14 @@ class Filed extends BaseSearch
                if (count($posts) == 0) {
                        return '';
                }
-               $item_condition = ['uid' => [0, local_user()], 'uri-id' => $posts];
+               $item_condition = ['uid' => [0, Session::getLocalUser()], 'uri-id' => $posts];
                $item_params = ['order' => ['uri-id' => true, 'uid' => true]];
 
-               $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $item_condition, $item_params));
+               $items = Post::toArray(Post::selectForUser(Session::getLocalUser(), Item::DISPLAY_FIELDLIST, $item_condition, $item_params));
 
-               $o .= conversation(DI::app(), $items, 'filed', false, false, '', local_user());
+               $o .= DI::conversation()->create($items, 'filed', false, false, '', Session::getLocalUser());
 
-               if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+               if (DI::pConfig()->get(Session::getLocalUser(), 'system', 'infinite_scroll')) {
                        $o .= HTML::scrollLoader();
                } else {
                        $o .= $pager->renderMinimal($count);