Add hidden password input to Console\NewPassword

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index f1b747917ce6100ff1398e6deec73e0b6e89e6e4..40ebdbb6e011f2aa5cea9a9f0a55523da7815d8b 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -2,8 +2,10 @@
 /**
  * @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;
@@ -63,7 +65,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 +73,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 +84,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 +106,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(),
@@ -183,21 +184,19 @@ function community_content(App $a, $update = 0)
 function community_getitems($start, $itemspage, $content)
 {
        if ($content == 'local') {
-               $r = dba::p("SELECT " . item_fieldlists() . " FROM `thread`
+               $r = dba::p("SELECT `item`.`uri`, `item`.`author-link` FROM `thread`
                        INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
                        INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''" .
-                       item_joins() . " AND `contact`.`self`
                        WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
-                       AND NOT `thread`.`private` AND `thread`.`wall`
+                       AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin`
                        ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)
                );
                return dba::inArray($r);
        } elseif ($content == 'global') {
                $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);
        }