DBA: Nothing really done ..

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
old mode 100755 (executable)
new mode 100644 (file)
index a989999..bfe5a30
--- a/mod/community.php
+++ b/mod/community.php
@@ -41,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 `item`.`moderated` = 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 "
+               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))
@@ -61,7 +62,7 @@ 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`,
@@ -69,9 +70,10 @@ function community_content(&$a, $update = 0) {
                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 `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
+               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'])