X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcommunity.php;h=1017698eaa5c134f5f5f24115f4f9f68070f8fc1;hb=a09273802ef0b790c0374a2fece6cded5686ebc2;hp=9c9fb4390038fed56110a1465f73e176f31c5c0f;hpb=dc4b6ba55996ff2dee23f329502ff41a9d651962;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index 9c9fb43900..1017698eaa 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -5,12 +5,14 @@
 
 use Friendica\App;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
 
 function community_init(App $a)
 {
@@ -90,7 +92,6 @@ function community_content(App $a, $update = 0)
 		}
 	}
 
-	require_once 'include/security.php';
 	require_once 'include/conversation.php';
 
 	if (!$update) {
@@ -153,9 +154,9 @@ function community_content(App $a, $update = 0)
 		$itemspage_network = $a->force_max_items;
 	}
 
-	$a->set_pager_itemspage($itemspage_network);
+	$pager = new Pager($a->query_string, $itemspage_network);
 
-	$r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content, $accounttype);
+	$r = community_getitems($pager->getStart(), $pager->getItemsPerPage(), $content, $accounttype);
 
 	if (!DBA::isResult($r)) {
 		info(L10n::t('No results.') . EOL);
@@ -179,22 +180,22 @@ function community_content(App $a, $update = 0)
 				}
 				$previousauthor = $item["author-link"];
 
-				if (($numposts < $maxpostperauthor) && (count($s) < $a->pager['itemspage'])) {
+				if (($numposts < $maxpostperauthor) && (count($s) < $pager->getItemsPerPage())) {
 					$s[] = $item;
 				}
 			}
-			if (count($s) < $a->pager['itemspage']) {
-				$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content, $accounttype);
+			if (count($s) < $pager->getItemsPerPage()) {
+				$r = community_getitems($pager->getStart() + ($count * $pager->getItemsPerPage()), $pager->getItemsPerPage(), $content, $accounttype);
 			}
-		} while ((count($s) < $a->pager['itemspage']) && ( ++$count < 50) && (count($r) > 0));
+		} while ((count($s) < $pager->getItemsPerPage()) && ( ++$count < 50) && (count($r) > 0));
 	} else {
 		$s = $r;
 	}
 
-	$o .= conversation($a, $s, 'community', $update, false, 'commented', local_user());
+	$o .= conversation($a, $s, $pager, 'community', $update, false, 'commented', local_user());
 
 	if (!$update) {
-		$o .= alt_pager($a, count($r));
+		$o .= $pager->renderMinimal(count($r));
 	}
 
 	$t = get_markup_template("community.tpl");
@@ -227,19 +228,12 @@ function community_getitems($start, $itemspage, $content, $accounttype)
 		return DBA::toArray($r);
 	} elseif ($content == 'global') {
 		if (!is_null($accounttype)) {
-			$sql_accounttype = " AND `owner`.`contact-type` = ?";
-			$values = [$accounttype, $start, $itemspage];
+			$condition = ["`uid` = ? AND `owner`.`contact-type` = ?", 0, $accounttype];
 		} else {
-			$sql_accounttype = "";
-			$values = [$start, $itemspage];
+			$condition = ['uid' => 0];
 		}
 
-		$r = DBA::p("SELECT `uri` FROM `thread`
-				INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-				INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
-				INNER JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`
-				WHERE `thread`.`uid` = 0 AND NOT `author`.`hidden` AND NOT `author`.`blocked` $sql_accounttype
-				ORDER BY `thread`.`commented` DESC LIMIT ?, ?", $values);
+		$r = Item::selectThreadForUser(0, ['uri'], $condition, ['order' => ['commented' => true], 'limit' => [$start, $itemspage]]);
 		return DBA::toArray($r);
 	}