Merge pull request #10575 from MrPetovan/bug/10019-peertube-embed

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

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 01eac67335bf418fb88a937e2920feed1e616bef..20b3a93258636582eb8db614b9cf6b9dacb37de7 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -144,9 +144,9 @@ class Nav
         *    array 'userinfo' => Array of user information (name, icon)
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function getInfo(App $a)
+       private static function getInfo(App $a): array
        {
-               $ssl_state = ((local_user()) ? true : false);
+               $ssl_state = (bool) local_user();
 
                /*
                 * Our network is distributed, and as you visit friends some of the
@@ -158,13 +158,27 @@ class Nav
 
                $sitelocation = $myident . substr(DI::baseUrl()->get($ssl_state), strpos(DI::baseUrl()->get($ssl_state), '//') + 2);
 
-               // nav links: array of array('href', 'text', 'extra css classes', 'title')
-               $nav = [];
+               $nav = [
+                       'admin'         => null,
+                       'apps'          => null,
+                       'community'     => null,
+                       'home'          => null,
+                       'events'        => null,
+                       'login'         => null,
+                       'logout'        => null,
+                       'langselector'  => null,
+                       'messages'      => null,
+                       'network'       => null,
+                       'notifications' => null,
+                       'remote'        => null,
+                       'search'        => null,
+                       'usermenu'      => [],
+               ];
 
                // Display login or logout
-               $nav['usermenu'] = [];
                $userinfo = null;
 
+               // nav links: array of array('href', 'text', 'extra css classes', 'title')
                if (Session::isAuthenticated()) {
                        $nav['logout'] = ['logout', DI::l10n()->t('Logout'), '', DI::l10n()->t('End this session')];
                } else {
@@ -275,7 +289,7 @@ class Nav
                        $nav['messages']['outbox'] = ['message/sent', DI::l10n()->t('Outbox'), '', DI::l10n()->t('Outbox')];
                        $nav['messages']['new'] = ['message/new', DI::l10n()->t('New Message'), '', DI::l10n()->t('New Message')];
 
-                       if (is_array($a->identities) && count($a->identities) > 1) {
+                       if (User::hasIdentities(DI::session()->get('submanage') ?: local_user())) {
                                $nav['delegation'] = ['delegation', DI::l10n()->t('Accounts'), '', DI::l10n()->t('Manage other pages')];
                        }
 
@@ -297,13 +311,15 @@ class Nav
                        $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
                }
 
-               Hook::callAll('nav_info', $nav);
-
-               return [
+               $nav_info = [
+                       'banner'       => $banner,
+                       'nav'          => $nav,
                        'sitelocation' => $sitelocation,
-                       'nav' => $nav,
-                       'banner' => $banner,
-                       'userinfo' => $userinfo,
+                       'userinfo'     => $userinfo,
                ];
+
+               Hook::callAll('nav_info', $nav_info);
+
+               return $nav_info;
        }
 }