Better implementation of "hidewall"

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index 8d23c4af287b59b7d35c34d005a1c012f1ce303c..b6d72a35555a64f375b1402fc3188c93357c3579 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -14,12 +14,16 @@ function community_content(&$a, $update = 0) {
 
        $o = '';
 
+       // Currently the community page isn't able to handle update requests
+       if ($update)
+               return;
+
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                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,7 +48,7 @@ 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` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
@@ -103,10 +107,9 @@ function community_content(&$a, $update = 0) {
 
        $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);
        }
 
@@ -114,6 +117,9 @@ function community_content(&$a, $update = 0) {
 }
 
 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`,
@@ -136,3 +142,18 @@ function community_getitems($start, $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 `thread`
+               INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+               WHERE `thread`.`uid` = 0
+               ORDER BY `thread`.`created` DESC LIMIT %d, %d",
+               intval($start),
+               intval($itemspage)
+       );
+
+       return($r);
+}