X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcommunity.php;h=7775fdba4ab845d36c83c7618e22a6fa38ac12fb;hb=af6dbc654f82225cfc647fe2072662acae388e47;hp=40ebdbb6e011f2aa5cea9a9f0a55523da7815d8b;hpb=a7db21c8fd8d1584bbc77566c830e26d9ea3519b;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index 40ebdbb6e0..7775fdba4a 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -9,6 +9,7 @@ use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 
 function community_init(App $a)
@@ -30,6 +31,11 @@ function community_content(App $a, $update = 0)
 
 	$page_style = Config::get('system', 'community_page_style');
 
+	if ($page_style == CP_NO_INTERNAL_COMMUNITY) {
+		notice(L10n::t('Access denied.') . EOL);
+		return;
+	}
+
 	if ($a->argc > 1) {
 		$content = $a->argv[1];
 	} else {
@@ -166,7 +172,7 @@ function community_content(App $a, $update = 0)
 		$s = $r;
 	}
 
-	$o .= conversation($a, $s, 'community', $update);
+	$o .= conversation($a, $s, 'community', $update, false, 'commented', local_user());
 
 	if (!$update) {
 		$o .= alt_pager($a, count($r));
@@ -184,21 +190,22 @@ function community_content(App $a, $update = 0)
 function community_getitems($start, $itemspage, $content)
 {
 	if ($content == 'local') {
-		$r = dba::p("SELECT `item`.`uri`, `item`.`author-link` FROM `thread`
+		$r = DBA::p("SELECT `item`.`uri`, `author`.`url` AS `author-link` FROM `thread`
 			INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
 			INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+			INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
 			WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
 			AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin`
 			ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)
 		);
-		return dba::inArray($r);
+		return DBA::inArray($r);
 	} elseif ($content == 'global') {
-		$r = dba::p("SELECT `uri` FROM `thread`
+		$r = DBA::p("SELECT `uri` FROM `thread`
 				INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-		                INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
+				INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
 				WHERE `thread`.`uid` = 0 AND NOT `author`.`hidden` AND NOT `author`.`blocked`
 				ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage));
-		return dba::inArray($r);
+		return DBA::inArray($r);
 	}
 
 	// Should never happen