Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index cb255029f0d47e84d64ae9e825c731cdf1982362..bfe5a30893f6d1fda936ea9dd045d19155f5fc63 100644 (file)
--- 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) {
 
@@ -19,9 +26,6 @@ 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) {
@@ -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`
+       $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 `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-               AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 "
+               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,17 +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`, `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 `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-               AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+               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'])
@@ -76,12 +82,10 @@ function community_content(&$a, $update = 0) {
 
        // we behave the same in message lists as the search module
 
-       $o .= conversation($a,$r,'community',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;
 }