X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=d1432b7bbbf5c19dbd780a6f7eecbc59e7123063;hb=7c73e8634c954cc2bd0d1138729459d7d5090f62;hp=876339dea11d8de39de3408ef5826a8429b7f783;hpb=ba35b19af644d375acc4a99e535e92afd2e7ab51;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index 876339dea1..d1432b7bbb 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -9,7 +9,8 @@ use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 
 function community_init(App $a)
 {
@@ -35,6 +36,25 @@ function community_content(App $a, $update = 0)
 		return;
 	}
 
+	$accounttype = null;
+
+	if ($a->argc > 2) {
+		switch ($a->argv[2]) {
+			case 'person':
+				$accounttype = Contact::ACCOUNT_TYPE_PERSON;
+				break;
+			case 'organisation':
+				$accounttype = Contact::ACCOUNT_TYPE_ORGANISATION;
+				break;
+			case 'news':
+				$accounttype = Contact::ACCOUNT_TYPE_NEWS;
+				break;
+			case 'community':
+				$accounttype = Contact::ACCOUNT_TYPE_COMMUNITY;
+				break;
+		}
+	}
+
 	if ($a->argc > 1) {
 		$content = $a->argv[1];
 	} else {
@@ -133,11 +153,11 @@ function community_content(App $a, $update = 0)
 		$itemspage_network = $a->force_max_items;
 	}
 
-	$a->set_pager_itemspage($itemspage_network);
+	$a->setPagerItemsPage($itemspage_network);
 
-	$r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content);
+	$r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content, $accounttype);
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		info(L10n::t('No results.') . EOL);
 		return $o;
 	}
@@ -164,14 +184,14 @@ function community_content(App $a, $update = 0)
 				}
 			}
 			if (count($s) < $a->pager['itemspage']) {
-				$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content);
+				$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content, $accounttype);
 			}
 		} while ((count($s) < $a->pager['itemspage']) && ( ++$count < 50) && (count($r) > 0));
 	} else {
 		$s = $r;
 	}
 
-	$o .= conversation($a, $s, 'community', $update);
+	$o .= conversation($a, $s, 'community', $update, false, 'commented', local_user());
 
 	if (!$update) {
 		$o .= alt_pager($a, count($r));
@@ -186,24 +206,41 @@ function community_content(App $a, $update = 0)
 	]);
 }
 
-function community_getitems($start, $itemspage, $content)
+function community_getitems($start, $itemspage, $content, $accounttype)
 {
 	if ($content == 'local') {
-		$r = dba::p("SELECT `item`.`uri`, `item`.`author-link` FROM `thread`
+		if (!is_null($accounttype)) {
+			$sql_accounttype = " AND `user`.`account-type` = ?";
+			$values = [$accounttype, $start, $itemspage];
+		} else {
+			$sql_accounttype = "";
+			$values = [$start, $itemspage];
+		}
+
+		$r = DBA::p("SELECT `item`.`uri`, `author`.`url` AS `author-link` FROM `thread`
 			INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
 			INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+			INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
 			WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
-			AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin`
-			ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)
-		);
-		return dba::inArray($r);
+			AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin` $sql_accounttype
+			ORDER BY `thread`.`commented` DESC LIMIT ?, ?", $values);
+		return DBA::toArray($r);
 	} elseif ($content == 'global') {
-		$r = dba::p("SELECT `uri` FROM `thread`
+		if (!is_null($accounttype)) {
+			$sql_accounttype = " AND `owner`.`contact-type` = ?";
+			$values = [$accounttype, $start, $itemspage];
+		} else {
+			$sql_accounttype = "";
+			$values = [$start, $itemspage];
+		}
+
+		$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`
-				WHERE `thread`.`uid` = 0 AND NOT `author`.`hidden` AND NOT `author`.`blocked`
-				ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage));
-		return dba::inArray($r);
+				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);
+		return DBA::toArray($r);
 	}
 
 	// Should never happen