Merge pull request #3627 from tobiasd/20170812-invite

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index 2f48c985c0fbe5c272f8bac24dcdea85a298542c..89a369d94f2577a47332b2cead1247559edc31d2 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -1,29 +1,25 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+
 function community_init(App $a) {
        if (! local_user()) {
                unset($_SESSION['theme']);
                unset($_SESSION['mobile-theme']);
        }
-
-
 }
 
-
 function community_content(App $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())) {
+       if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                return;
        }
 
-       if (get_config('system','community_page_style') == CP_NO_COMMUNITY_PAGE) {
+       if (Config::get('system','community_page_style') == CP_NO_COMMUNITY_PAGE) {
                notice( t('Not available.') . EOL);
                return;
        }
@@ -38,11 +34,11 @@ function community_content(App $a, $update = 0) {
                nav_set_selected('community');
        }
 
-       if (x($a->data,'search'))
+       if (x($a->data,'search')) {
                $search = notags(trim($a->data['search']));
-       else
+       } else {
                $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
-
+       }
 
        // Here is the way permissions work in this module...
        // Only public posts can be shown
@@ -55,7 +51,7 @@ function community_content(App $a, $update = 0) {
                return $o;
        }
 
-       $maxpostperauthor = get_config('system','max_author_posts_community_page');
+       $maxpostperauthor = Config::get('system','max_author_posts_community_page');
 
        if ($maxpostperauthor != 0) {
                $count = 1;
@@ -65,37 +61,37 @@ function community_content(App $a, $update = 0) {
 
                do {
                        foreach ($r AS $row=>$item) {
-                               if ($previousauthor == $item["author-link"])
+                               if ($previousauthor == $item["author-link"]) {
                                        ++$numposts;
-                               else
+                               } else {
                                        $numposts = 0;
-
+                               }
                                $previousauthor = $item["author-link"];
 
-                               if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage']))
+                               if (($numposts < $maxpostperauthor) && (sizeof($s) < $a->pager['itemspage'])) {
                                        $s[] = $item;
+                               }
                        }
-                       if ((sizeof($s) < $a->pager['itemspage']))
+                       if ((sizeof($s) < $a->pager['itemspage'])) {
                                $r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']);
-
-               } while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0));
+                       }
+               } while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0));
        } else {
                $s = $r;
        }
-
        // we behave the same in message lists as the search module
 
        $o .= conversation($a, $s, 'community', $update);
 
-       $o .= alt_pager($a, count($r));
+        $o .= alt_pager($a, count($r));
 
        return $o;
 }
 
 function community_getitems($start, $itemspage) {
-       if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
+       if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) {
                return(community_getpublicitems($start, $itemspage));
-
+       }
        $r = qu("SELECT %s
                FROM `thread`
                INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
@@ -119,10 +115,10 @@ function community_getpublicitems($start, $itemspage) {
        $r = qu("SELECT %s
                FROM `thread`
                INNER JOIN `item` ON `item`.`id` = `thread`.`iid` %s
-               WHERE `thread`.`uid` = 0
+               WHERE `thread`.`uid` = 0 AND `verb` = '%s'
                ORDER BY `thread`.`created` DESC LIMIT %d, %d",
                item_fieldlists(), item_joins(),
-               intval($start), intval($itemspage)
+               dbesc(ACTIVITY_POST), intval($start), intval($itemspage)
        );
 
        return($r);