Ops, one more left ...

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index 29fcd447944fc2020362f0099038155be2fceb67..cb4f69c9173c8e87158d1a8cb0adaa0a9380acc3 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -2,12 +2,14 @@
 /**
  * @file mod/community.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
+use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 function community_init(App $a)
 {
@@ -28,6 +30,11 @@ function community_content(App $a, $update = 0)
 
        $page_style = Config::get('system', 'community_page_style');
 
+       if ($page_style == CP_NO_INTERNAL_COMMUNITY) {
+               notice(L10n::t('Access denied.') . EOL);
+               return;
+       }
+
        if ($a->argc > 1) {
                $content = $a->argv[1];
        } else {
@@ -63,7 +70,6 @@ function community_content(App $a, $update = 0)
                }
        }
 
-       require_once 'include/bbcode.php';
        require_once 'include/security.php';
        require_once 'include/conversation.php';
 
@@ -72,7 +78,7 @@ function community_content(App $a, $update = 0)
 
                if ((local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) && empty(Config::get('system', 'singleuser'))) {
                        $tabs[] = [
-                               'label' => L10n::t('Community'),
+                               'label' => L10n::t('Local Community'),
                                'url' => 'community/local',
                                'sel' => $content == 'local' ? 'active' : '',
                                'title' => L10n::t('Posts from local users on this server'),
@@ -83,10 +89,10 @@ function community_content(App $a, $update = 0)
 
                if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_GLOBAL_COMMUNITY])) {
                        $tabs[] = [
-                               'label' => L10n::t('Global Timeline'),
+                               'label' => L10n::t('Global Community'),
                                'url' => 'community/global',
                                'sel' => $content == 'global' ? 'active' : '',
-                               'title' => L10n::t('Posts from users of the federated network'),
+                               'title' => L10n::t('Posts from users of the whole federated network'),
                                'id' => 'community-global-tab',
                                'accesskey' => 'g'
                        ];
@@ -105,7 +111,7 @@ function community_content(App $a, $update = 0)
                                'default_location' => $a->user['default-location'],
                                'nickname' => $a->user['nickname'],
                                'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-                               'acl' => populate_acl($a->user, true),
+                               'acl' => ACL::getFullSelectorHTML($a->user, true),
                                'bang' => '',
                                'visitor' => 'block',
                                'profile_uid' => local_user(),
@@ -131,7 +137,7 @@ function community_content(App $a, $update = 0)
 
        $r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content);
 
-       if (!DBM::is_result($r)) {
+       if (!DBA::isResult($r)) {
                info(L10n::t('No results.') . EOL);
                return $o;
        }
@@ -165,7 +171,7 @@ function community_content(App $a, $update = 0)
                $s = $r;
        }
 
-       $o .= conversation($a, $s, 'community', $update);
+       $o .= conversation($a, $s, 'community', $update, false, 'commented', local_user());
 
        if (!$update) {
                $o .= alt_pager($a, count($r));
@@ -183,20 +189,22 @@ function community_content(App $a, $update = 0)
 function community_getitems($start, $itemspage, $content)
 {
        if ($content == 'local') {
-               $r = dba::p("SELECT `item`.`uri`, `item`.`author-link` FROM `thread`
+               $r = DBA::p("SELECT `item`.`uri`, `author`.`url` AS `author-link` FROM `thread`
                        INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
                        INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+                       INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
                        WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
                        AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin`
                        ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)
                );
-               return dba::inArray($r);
+               return DBA::toArray($r);
        } elseif ($content == 'global') {
-               $r = dba::p("SELECT `uri` FROM `thread`
+               $r = DBA::p("SELECT `uri` FROM `thread`
                                INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-                               WHERE `thread`.`uid` = 0
+                               INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
+                               WHERE `thread`.`uid` = 0 AND NOT `author`.`hidden` AND NOT `author`.`blocked`
                                ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage));
-               return dba::inArray($r);
+               return DBA::toArray($r);
        }
 
        // Should never happen