X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=c8f04d8bd619e67bea2afe626065c20b0c1e3a60;hb=a9bed1422e0a476df17a9e6edefce1925404184d;hp=8d23c4af287b59b7d35c34d005a1c012f1ce303c;hpb=32926bc803e81ef619cbf882471612172b1a8636;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index 8d23c4af28..c8f04d8bd6 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -14,12 +14,16 @@ function community_content(&$a, $update = 0) {
 
 	$o = '';
 
+	// Currently the community page isn't able to handle update requests
+	if ($update)
+		return;
+
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
 
-	if(get_config('system','no_community_page')) {
+	if(get_config('system','community_page_style') == CP_NO_COMMUNITY_PAGE) {
 		notice( t('Not available.') . EOL);
 		return;
 	}
@@ -44,8 +48,8 @@ function community_content(&$a, $update = 0) {
 	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
 
-	if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
-		$r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
+	if(get_config('system', 'old_pager')) {
+		$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
@@ -55,7 +59,7 @@ function community_content(&$a, $update = 0) {
 			AND `item`.`private` = 0 AND `item`.`wall` = 1"
 		);
 
-		if(count($r))
+		if (dbm::is_result($r))
 			$a->set_pager_total($r[0]['total']);
 
 		if(! $r[0]['total']) {
@@ -67,7 +71,7 @@ function community_content(&$a, $update = 0) {
 
 	$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}
@@ -103,10 +107,9 @@ function community_content(&$a, $update = 0) {
 
 	$o .= conversation($a,$s,'community',$update);
 
-	if(get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) {
+	if(!get_config('system', 'old_pager')) {
 	        $o .= alt_pager($a,count($r));
-	}
-	else {
+	} else {
 	        $o .= paginate($a);
 	}
 
@@ -114,25 +117,37 @@ function community_content(&$a, $update = 0) {
 }
 
 function community_getitems($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`
+	if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
+		return(community_getpublicitems($start, $itemspage));
+
+	$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);
 
 }
+
+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)
+	);
+
+	return($r);
+}