X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcommunity.php;h=b6d72a35555a64f375b1402fc3188c93357c3579;hb=06998f13b61fcd50588f425703793bacc2e55cab;hp=5b3f40a798f47892c407ff3716c330879499569e;hpb=1a0a80c310faf51b3c2274708162ad8d817365eb;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index 5b3f40a798..b6d72a3555 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,7 +48,7 @@ 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')) ) {
+	if(get_config('system', 'old_pager')) {
 		$r = q("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
@@ -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,7 +117,8 @@ function community_content(&$a, $update = 0) {
 }
 
 function community_getitems($start, $itemspage) {
-// Work in progress	return(community_getpublicitems($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`,
@@ -127,7 +131,7 @@ function community_getitems($start, $itemspage) {
 		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` OR `contact`.`remote_self`)
+		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 ",
@@ -143,16 +147,13 @@ 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`
-		FROM `item` WHERE `item`.`uid` = 0 AND `network` IN ('%s', '%s')
-		AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
-		AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
-		ORDER BY `item`.`received` DESC LIMIT %d, %d",
-		dbesc(NETWORK_DFRN),
-		dbesc(NETWORK_DIASPORA),
+		FROM `thread`
+		INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+		WHERE `thread`.`uid` = 0
+		ORDER BY `thread`.`created` DESC LIMIT %d, %d",
 		intval($start),
 		intval($itemspage)
 	);
 
 	return($r);
-
 }