X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FSearch%2FFiled.php;h=5f3c30f9baa9cedacf057b29b66b3112d84b541f;hb=d47d78f2d46eaaf4005b434f6a7cfab37f9a3f0b;hp=f14c29aa3dd339560e75b2ab5c8e8af66dfd86f6;hpb=751232d679ed254ccf28ef371ae3ac56b5889e39;p=friendica.git

diff --git a/src/Module/Search/Filed.php b/src/Module/Search/Filed.php
index f14c29aa3d..5f3c30f9ba 100644
--- 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,23 +60,30 @@ 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'));
 		}
 
+		$last_uriid = isset($_GET['last_uriid']) ? intval($_GET['last_uriid']) : 0;
+
 		$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;
 		}
+
+		if (!empty($last_uriid)) {
+			$term_condition = DBA::mergeConditions($term_condition, ["`uri-id` < ?", $last_uriid]);
+		}
+
 		$term_params = ['order' => ['uri-id' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 		$result = DBA::select('category-view', ['uri-id'], $term_condition, $term_params);
 
-		$total = DBA::count('category-view', $term_condition);
+		$count = DBA::count('category-view', $term_condition);
 
 		$posts = [];
 		while ($term = DBA::fetch($result)) {
@@ -67,17 +94,17 @@ class Filed extends BaseSearch
 		if (count($posts) == 0) {
 			return '';
 		}
-		$item_condition = ['uid' => local_user(), 'uri-id' => $posts];
-		$item_params = ['order' => ['uri-id' => true]];
+		$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->renderFull($total);
+			$o .= $pager->renderMinimal($count);
 		}
 
 		return $o;