]> git.mxchange.org Git - friendica.git/commitdiff
Restructured code
authorMichael <heluecht@pirati.ca>
Sun, 27 Sep 2020 05:46:07 +0000 (05:46 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 27 Sep 2020 05:46:07 +0000 (05:46 +0000)
src/Module/Conversation/Community.php

index 08774ad122b4156d5a10cfcf07a4686a1a69f2a6..6d42921ef5d351395cffa21e34e1704208bcb350 100644 (file)
@@ -48,48 +48,102 @@ class Community extends BaseModule
 
        public static function content(array $parameters = [])
        {
-               // Rawmode is used for fetching new content at the end of the page
-               $rawmode = (isset($_GET['mode']) AND ($_GET['mode'] == 'raw'));
-
                self::parseRequest($parameters);
 
-               $tabs = [];
-
-               if ((Session::isAuthenticated() || in_array(self::$page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) && empty(DI::config()->get('system', 'singleuser'))) {
-                       $tabs[] = [
-                               'label' => DI::l10n()->t('Local Community'),
-                               'url' => 'community/local',
-                               'sel' => self::$content == 'local' ? 'active' : '',
-                               'title' => DI::l10n()->t('Posts from local users on this server'),
-                               'id' => 'community-local-tab',
-                               'accesskey' => 'l'
-                       ];
-               }
-
-               if (Session::isAuthenticated() || in_array(self::$page_style, [CP_USERS_AND_GLOBAL, CP_GLOBAL_COMMUNITY])) {
-                       $tabs[] = [
-                               'label' => DI::l10n()->t('Global Community'),
-                               'url' => 'community/global',
-                               'sel' => self::$content == 'global' ? 'active' : '',
-                               'title' => DI::l10n()->t('Posts from users of the whole federated network'),
-                               'id' => 'community-global-tab',
-                               'accesskey' => 'g'
-                       ];
-               }
-
                if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
                        $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
                        $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
                } else {
                        $o = '';
                }
+
+               if (empty($_GET['mode']) || ($_GET['mode'] != 'raw')) {
+                       $tabs = [];
+
+                       if ((Session::isAuthenticated() || in_array(self::$page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) && empty(DI::config()->get('system', 'singleuser'))) {
+                               $tabs[] = [
+                                       'label' => DI::l10n()->t('Local Community'),
+                                       'url' => 'community/local',
+                                       'sel' => self::$content == 'local' ? 'active' : '',
+                                       'title' => DI::l10n()->t('Posts from local users on this server'),
+                                       'id' => 'community-local-tab',
+                                       'accesskey' => 'l'
+                               ];
+                       }
        
-               if (!$rawmode) {
+                       if (Session::isAuthenticated() || in_array(self::$page_style, [CP_USERS_AND_GLOBAL, CP_GLOBAL_COMMUNITY])) {
+                               $tabs[] = [
+                                       'label' => DI::l10n()->t('Global Community'),
+                                       'url' => 'community/global',
+                                       'sel' => self::$content == 'global' ? 'active' : '',
+                                       'title' => DI::l10n()->t('Posts from users of the whole federated network'),
+                                       'id' => 'community-global-tab',
+                                       'accesskey' => 'g'
+                               ];
+                       }
+
                        $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
                        $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
-               }
 
-               Nav::setSelected('community');
+                       Nav::setSelected('community');
+
+                       DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_accounts.tpl'), [
+                               '$title'        => DI::l10n()->t('Accounts'),
+                               '$content'      => self::$content,
+                               '$accounttype'  => ($parameters['accounttype'] ?? ''),
+                               '$all'          => DI::l10n()->t('All'),
+                               '$person'       => DI::l10n()->t('Persons'),
+                               '$organisation' => DI::l10n()->t('Organisations'),
+                               '$news'         => DI::l10n()->t('News'),
+                               '$community'    => DI::l10n()->t('Forums'),
+                       ]);
+       
+                       if (local_user() && DI::config()->get('system', 'community_no_sharer')) {
+                               $path = self::$content . ($parameters['accounttype'] ? '/' . $parameters['accounttype'] : '');
+                               $query_parameters = [];
+               
+                               if (!empty($_GET['since_id'])) {
+                                       $query_parameters['since_id'] = $_GET['since_id'];
+                               }
+                               if (!empty($_GET['max_id'])) {
+                                       $query_parameters['max_id'] = $_GET['max_id'];
+                               }
+                               if (!empty($_GET['last_commented'])) {
+                                       $query_parameters['max_id'] = $_GET['last_commented'];
+                               }
+               
+                               $path_all = $path . (!empty($query_parameters) ? '?' . http_build_query($query_parameters) : '');
+                               $path_no_sharer = $path . '?' . http_build_query(array_merge($query_parameters, ['no_sharer' => true]));
+                               DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_sharer.tpl'), [
+                                       '$title'           => DI::l10n()->t('Own Contacts'),
+                                       '$path_all'        => $path_all,
+                                       '$path_no_sharer'  => $path_no_sharer,
+                                       '$no_sharer'       => !empty($_REQUEST['no_sharer']),
+                                       '$all'             => DI::l10n()->t('Include'),
+                                       '$no_sharer_label' => DI::l10n()->t('Hide'),
+                               ]);
+                       }
+       
+                       if (Feature::isEnabled(local_user(), 'trending_tags')) {
+                               DI::page()['aside'] .= TrendingTags::getHTML(self::$content);
+                       }
+
+                       // We need the editor here to be able to reshare an item.
+                       if (Session::isAuthenticated()) {
+                               $x = [
+                                       'is_owner' => true,
+                                       'allow_location' => DI::app()->user['allow_location'],
+                                       'default_location' => DI::app()->user['default-location'],
+                                       'nickname' => DI::app()->user['nickname'],
+                                       'lockstate' => (is_array(DI::app()->user) && (strlen(DI::app()->user['allow_cid']) || strlen(DI::app()->user['allow_gid']) || strlen(DI::app()->user['deny_cid']) || strlen(DI::app()->user['deny_gid'])) ? 'lock' : 'unlock'),
+                                       'acl' => ACL::getFullSelectorHTML(DI::page(), DI::app()->user, true),
+                                       'bang' => '',
+                                       'visitor' => 'block',
+                                       'profile_uid' => local_user(),
+                               ];
+                               $o .= status_editor(DI::app(), $x, 0, true);
+                       }
+               }
 
                $items = self::getItems();
 
@@ -98,22 +152,6 @@ class Community extends BaseModule
                        return $o;
                }
 
-               // We need the editor here to be able to reshare an item.
-               if (Session::isAuthenticated()) {
-                       $x = [
-                               'is_owner' => true,
-                               'allow_location' => DI::app()->user['allow_location'],
-                               'default_location' => DI::app()->user['default-location'],
-                               'nickname' => DI::app()->user['nickname'],
-                               'lockstate' => (is_array(DI::app()->user) && (strlen(DI::app()->user['allow_cid']) || strlen(DI::app()->user['allow_gid']) || strlen(DI::app()->user['deny_cid']) || strlen(DI::app()->user['deny_gid'])) ? 'lock' : 'unlock'),
-                               'acl' => ACL::getFullSelectorHTML(DI::page(), DI::app()->user, true),
-                               'bang' => '',
-                               'visitor' => 'block',
-                               'profile_uid' => local_user(),
-                       ];
-                       $o .= status_editor(DI::app(), $x, 0, true);
-               }
-
                $o .= conversation(DI::app(), $items, 'community', false, false, 'commented', local_user());
 
                $pager = new BoundariesPager(
@@ -130,49 +168,6 @@ class Community extends BaseModule
                        $o .= $pager->renderMinimal(count($items));
                }
 
-               if (!$rawmode) {
-                       DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_accounts.tpl'), [
-                               '$title'        => DI::l10n()->t('Accounts'),
-                               '$content'      => self::$content,
-                               '$accounttype'  => ($parameters['accounttype'] ?? ''),
-                               '$all'          => DI::l10n()->t('All'),
-                               '$person'       => DI::l10n()->t('Persons'),
-                               '$organisation' => DI::l10n()->t('Organisations'),
-                               '$news'         => DI::l10n()->t('News'),
-                               '$community'    => DI::l10n()->t('Forums'),
-                       ]);
-               }
-
-               if (!$rawmode && local_user() && DI::config()->get('system', 'community_no_sharer')) {
-                       $path = self::$content . ($parameters['accounttype'] ? '/' . $parameters['accounttype'] : '');
-                       $query_parameters = [];
-       
-                       if (!empty($_GET['since_id'])) {
-                               $query_parameters['since_id'] = $_GET['since_id'];
-                       }
-                       if (!empty($_GET['max_id'])) {
-                               $query_parameters['max_id'] = $_GET['max_id'];
-                       }
-                       if (!empty($_GET['last_commented'])) {
-                               $query_parameters['max_id'] = $_GET['last_commented'];
-                       }
-       
-                       $path_all = $path . (!empty($query_parameters) ? '?' . http_build_query($query_parameters) : '');
-                       $path_no_sharer = $path . '?' . http_build_query(array_merge($query_parameters, ['no_sharer' => true]));
-                       DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_sharer.tpl'), [
-                               '$title'           => DI::l10n()->t('Own Contacts'),
-                               '$path_all'        => $path_all,
-                               '$path_no_sharer'  => $path_no_sharer,
-                               '$no_sharer'       => !empty($_REQUEST['no_sharer']),
-                               '$all'             => DI::l10n()->t('Include'),
-                               '$no_sharer_label' => DI::l10n()->t('Hide'),
-                       ]);
-               }
-
-               if (!$rawmode && Feature::isEnabled(local_user(), 'trending_tags')) {
-                       DI::page()['aside'] .= TrendingTags::getHTML(self::$content);
-               }
-
                $t = Renderer::getMarkupTemplate("community.tpl");
                return Renderer::replaceMacros($t, [
                        '$content' => $o,