X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcommunity.php;h=bfe5a30893f6d1fda936ea9dd045d19155f5fc63;hb=39927e3dc5d0fc942ef9428b5c5c0d9b8cbb2f56;hp=aaa3ad9ed31726f30b02544d531094471ef712d1;hpb=20d3aa2e77e4ba4c12d2a7332c7ac5f3a8f6b635;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index aaa3ad9ed3..bfe5a30893 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -1,5 +1,12 @@
 <?php
 
+function community_init(&$a) {
+	if(! local_user())
+		unset($_SESSION['theme']);
+
+
+}
+
 
 function community_content(&$a, $update = 0) {
 
@@ -10,7 +17,7 @@ function community_content(&$a, $update = 0) {
 		return;
 	}
 
-	if(! get_config('system','no_community_page')) {
+	if(get_config('system','no_community_page')) {
 		notice( t('Not available.') . EOL);
 		return;
 	}
@@ -19,15 +26,12 @@ function community_content(&$a, $update = 0) {
 	require_once('include/security.php');
 	require_once('include/conversation.php');
 
-	if(x($_SESSION,'theme'))
-		unset($_SESSION['theme']);
-
 
 	$o .= '<h3>' . t('Community') . '</h3>';
 	if(! $update) {
-		$o .= '<script>	$(document).ready(function() { $(\'#nav-community-link\').addClass(\'nav-selected\'); });</script>';
+		nav_set_selected('community');
 		$o .= '<div id="live-community"></div>' . "\r\n";
-		$o .= "<script> var profile_uid = -1; var netargs = ''; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+		$o .= "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 	}
 
 	if(x($a->data,'search'))
@@ -37,16 +41,17 @@ function community_content(&$a, $update = 0) {
 
 
 	// Here is the way permissions work in this module...
-	// Only public wall posts can be shown
+	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
 
 
-	$r = q("SELECT COUNT(*) AS `total`
-		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `profile` ON `profile`.`uid` = `item`.`uid`
-		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
-		AND `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `profile`.`hidewall` = 0 
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `profile`.`is-default` = 1 "
+	$r = q("SELECT distinct(`item`.`uri`) AS `total`
+		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` "
 	);
 
 	if(count($r))
@@ -57,18 +62,18 @@ function community_content(&$a, $update = 0) {
 		return $o;
 	}
 
-	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+	$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
-		`user`.`nickname`, `profile`.`hidewall`
+		`user`.`nickname`, `user`.`hidewall`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
-		LEFT JOIN `profile` ON `profile`.`uid` = `item`.`uid` 
-		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
-		AND `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `profile`.`hidewall` = 0 
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `profile`.`is-default` = 1
+		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'])
@@ -77,12 +82,10 @@ function community_content(&$a, $update = 0) {
 
 	// we behave the same in message lists as the search module
 
-	$o .= conversation($a,$r,'search',false);
+	$o .= conversation($a,$r,'community',$update);
 
 	$o .= paginate($a);
 
-	$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
-
 	return $o;
 }