X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=d6f87762bdefefda35ecdb15ec387c7711a439a9;hb=b888382cc6cc2b2b123ef06abefe4ea10c2620d5;hp=aa5bb7268d2dc3d25472516bdbbd09bf6b5b14e2;hpb=d972ccc408c8c5ab06fc8ce31714ad91a6d94802;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index aa5bb7268d..d6f87762bd 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -19,7 +19,7 @@ function community_content(&$a, $update = 0) {
 		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,14 +44,15 @@ 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` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+			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
 			WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-			AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+			AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 			AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-			AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0"
+			AND `item`.`private` = 0 AND `item`.`wall` = 1"
 		);
 
 		if(count($r))
@@ -64,40 +65,92 @@ function community_content(&$a, $update = 0) {
 
 	}
 
-	$r = q("SELECT distinct(`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`
-		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-		LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
-		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 group by `item`.`uri`
-		ORDER BY `received` DESC LIMIT %d, %d ",
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
-
-	);
+	$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
 
 	if(! count($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}
 
+	$maxpostperauthor = get_config('system','max_author_posts_community_page');
+
+	if ($maxpostperauthor != 0) {
+		$count = 1;
+		$previousauthor = "";
+		$numposts = 0;
+		$s = array();
+
+		do {
+			foreach ($r AS $row=>$item) {
+				if ($previousauthor == $item["author-link"])
+					++$numposts;
+				else
+					$numposts = 0;
+
+				$previousauthor = $item["author-link"];
+
+				if (($numposts < $maxpostperauthor) AND (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));
+	} else
+		$s = $r;
+
 	// we behave the same in message lists as the search module
 
-	$o .= conversation($a,$r,'community',$update);
+	$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);
 	}
 
 	return $o;
 }
 
+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`
+		FROM `thread` FORCE INDEX (`wall_private_received`)
+		INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND `user`.`hidewall` = 0
+		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)
+	);
+
+	return($r);
+
+}
+
+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 `item`.`id` = `item`.`parent`
+		AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
+		AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
+		ORDER BY `item`.`received` DESC LIMIT %d, %d",
+		intval($start),
+		intval($itemspage)
+	);
+
+	return($r);
+
+}