Network, Channels and Community are children of timeline

[friendica.git] / src / Content / Nav.php

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 9684b77ce94b85dd50da3ce4159c6afffb11a424..6cc799eb6b7fceedb43ca806b0ac29a4e028c324 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -42,6 +42,7 @@ class Nav
        private static $selected = [
                'global'    => null,
                'community' => null,
+               'channel'   => null,
                'network'   => null,
                'home'      => null,
                'profiles'  => null,
@@ -51,7 +52,7 @@ class Nav
                'directory' => null,
                'settings'  => null,
                'contacts'  => null,
-               'delegation'=> null,
+               'delegation' => null,
                'calendar'  => null,
                'register'  => null
        ];
@@ -123,7 +124,7 @@ class Nav
                        '$apps'         => $this->getAppMenu(),
                        '$home'         => $this->l10n->t('Go back'),
                        '$clear_notifs' => $this->l10n->t('Clear notifications'),
-                       '$search_hint'  => $this->l10n->t('@name, !forum, #tags, content')
+                       '$search_hint'  => $this->l10n->t('@name, !group, #tags, content')
                ]);
 
                Hook::callAll('page_header', $nav);
@@ -184,8 +185,6 @@ class Nav
         */
        private function getInfo(): array
        {
-               $ssl_state = (bool) $this->session->getLocalUserId();
-
                /*
                 * Our network is distributed, and as you visit friends some
                 * sites look exactly the same - it isn't always easy to know where you are.
@@ -194,13 +193,14 @@ class Nav
 
                $myident = !empty($this->session->getLocalUserNickname()) ? $this->session->getLocalUserNickname() . '@' : '';
 
-               $sitelocation = $myident . substr($this->baseUrl->get($ssl_state), strpos($this->baseUrl->get($ssl_state), '//') + 2);
+               $sitelocation = $myident . substr($this->baseUrl, strpos($this->baseUrl, '//') + 2);
 
                $nav = [
                        'admin'         => null,
                        'moderation'    => null,
                        'apps'          => null,
                        'community'     => null,
+                       'channel'       => null,
                        'home'          => null,
                        'calendar'      => null,
                        'login'         => null,
@@ -226,7 +226,7 @@ class Nav
 
                if ($this->session->isAuthenticated()) {
                        // user menu
-                       $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname(), $this->l10n->t('Status'), '', $this->l10n->t('Your posts and conversations')];
+                       $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname(), $this->l10n->t('Conversations'), '', $this->l10n->t('Conversations you started')];
                        $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname() . '/profile', $this->l10n->t('Profile'), '', $this->l10n->t('Your profile page')];
                        $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname() . '/photos', $this->l10n->t('Photos'), '', $this->l10n->t('Your photos')];
                        $nav['usermenu'][] = ['profile/' . $this->session->getLocalUserNickname() . '/media', $this->l10n->t('Media'), '', $this->l10n->t('Your postings with media')];
@@ -275,7 +275,7 @@ class Nav
                        ];
 
                        if ($this->config->get('system', 'poco_local_search')) {
-                               $nav['searchoption'][] = $this->l10n->t('Forums');
+                               $nav['searchoption'][] = $this->l10n->t('Groups');
                        }
                }
 
@@ -284,12 +284,14 @@ class Nav
                        $gdirpath = Profile::zrl($this->config->get('system', 'directory'), true);
                }
 
-               if (($this->session->getLocalUserId() || $this->config->get('system', 'community_page_style') != Community::DISABLED_VISITOR) &&
-                       !($this->config->get('system', 'community_page_style') == Community::DISABLED)) {
+               if ((!$this->session->isAuthenticated() && $this->config->get('system', 'community_page_style') != Community::DISABLED_VISITOR) &&
+                       !($this->config->get('system', 'community_page_style') == Community::DISABLED)
+               ) {
                        $nav['community'] = ['community', $this->l10n->t('Community'), '', $this->l10n->t('Conversations on this and other servers')];
                }
 
                if ($this->session->getLocalUserId()) {
+                       $nav['channel'] = ['channel', $this->l10n->t('Channels'), '', $this->l10n->t('Current posts, filtered by several rules')];
                        $nav['calendar'] = ['calendar', $this->l10n->t('Calendar'), '', $this->l10n->t('Calendar')];
                }