X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=83a2fdebf552082bf7244eec39fe3c1a7aec5f22;hb=ab60641e3ba731aca42ab510bdf9c2411db6aab4;hp=5c71667bdcc197c0c83dd1909c2a405e0a70e747;hpb=fa3fa42d966e00534aa6cbf33d60ef438a8e3b97;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index 5c71667bdc..83a2fdebf5 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -11,7 +11,6 @@ function community_init(App $a) {
 }
 
 function community_content(App $a, $update = 0) {
-
 	$o = '';
 
 	if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -68,14 +67,14 @@ function community_content(App $a, $update = 0) {
 				}
 				$previousauthor = $item["author-link"];
 
-				if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) {
+				if (($numposts < $maxpostperauthor) && (sizeof($s) < $a->pager['itemspage'])) {
 					$s[] = $item;
 				}
 			}
 			if ((sizeof($s) < $a->pager['itemspage'])) {
 				$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']);
 			}
-		} while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0));
+		} while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0));
 	} else {
 		$s = $r;
 	}
@@ -92,34 +91,27 @@ function community_getitems($start, $itemspage) {
 	if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) {
 		return(community_getpublicitems($start, $itemspage));
 	}
-	$r = qu("SELECT %s
-		FROM `thread`
+	$r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
 		INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
 		INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
 		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-		%s AND `contact`.`self`
+		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''".
+		item_joins()." AND `contact`.`self`
 		WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
 		AND NOT `thread`.`private` AND `thread`.`wall`
-		ORDER BY `thread`.`received` DESC LIMIT %d, %d",
-		item_fieldlists(), item_joins(),
-		intval($start), intval($itemspage)
+		ORDER BY `thread`.`received` DESC LIMIT ".intval($start).", ".intval($itemspage)
 	);
 
-	return($r);
-
+	return dba::inArray($r);
 }
 
 function community_getpublicitems($start, $itemspage) {
-
-	$r = qu("SELECT %s
-		FROM `thread`
-		INNER JOIN `item` ON `item`.`id` = `thread`.`iid` %s
-		WHERE `thread`.`uid` = 0
-		ORDER BY `thread`.`created` DESC LIMIT %d, %d",
-		item_fieldlists(), item_joins(),
-		intval($start), intval($itemspage)
+	$r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
+		INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins().
+		"WHERE `thread`.`uid` = 0 AND `verb` = ?
+		ORDER BY `thread`.`created` DESC LIMIT ".intval($start).", ".intval($itemspage),
+		ACTIVITY_POST
 	);
 
-	return($r);
+	return dba::inArray($r);
 }