X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=c8d1e0c9ddf10505661db79551ea36464b789470;hb=7823223a0595a541e1a5e011fe65f8c56c1e4d50;hp=b6d72a35555a64f375b1402fc3188c93357c3579;hpb=7e83ba090f7ff3889aec8a2e8f2b578210a66dc8;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index b6d72a3555..c8d1e0c9dd 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -49,7 +49,7 @@ function community_content(&$a, $update = 0) {
 	// OR your own posts if you are a logged in member
 
 	if(get_config('system', 'old_pager')) {
-		$r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
+		$r = qu("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
 			FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			INNER JOIN `user` ON `user`.`uid` = `item`.`uid` AND `user`.`hidewall` = 0
@@ -120,23 +120,18 @@ function community_getitems($start, $itemspage) {
 	if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
 		return(community_getpublicitems($start, $itemspage));
 
-	$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
-		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
-		`user`.`nickname`, `user`.`hidewall`
+	$r = qu("SELECT %s
 		FROM `thread` FORCE INDEX (`wall_private_received`)
-		INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND `user`.`hidewall` = 0
+		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`  = ''
-		INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self`
-		WHERE `thread`.`visible` = 1 AND `thread`.`deleted` = 0 and `thread`.`moderated` = 0
-		AND `thread`.`private` = 0 AND `thread`.`wall` = 1
-		ORDER BY `thread`.`received` DESC LIMIT %d, %d ",
-		intval($start),
-		intval($itemspage)
+		%s 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)
 	);
 
 	return($r);
@@ -144,15 +139,14 @@ function community_getitems($start, $itemspage) {
 }
 
 function community_getpublicitems($start, $itemspage) {
-	$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
-			`author-name` AS `name`, `owner-avatar` AS `photo`,
-			`owner-link` AS `url`, `owner-avatar` AS `thumb`
+
+	$r = qu("SELECT %s
 		FROM `thread`
-		INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+		INNER JOIN `item` ON `item`.`id` = `thread`.`iid` %s
 		WHERE `thread`.`uid` = 0
 		ORDER BY `thread`.`created` DESC LIMIT %d, %d",
-		intval($start),
-		intval($itemspage)
+		item_fieldlists(), item_joins(),
+		intval($start), intval($itemspage)
 	);
 
 	return($r);