Merge pull request #12513 from MrPetovan/bug/12507-rel-meeee

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

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index b80fb2d450e49712b9cf710b46e0686e14469b7e..8ebb412db7c6bffae87f6aa27e3d1e8904854a23 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -46,7 +46,7 @@ class Nav
                'settings'  => null,
                'contacts'  => null,
                'delegation'=> null,
-               'events'    => null,
+               'calendar'  => null,
                'register'  => null
        ];
 
@@ -162,10 +162,11 @@ class Nav
 
                $nav = [
                        'admin'         => null,
+                       'moderation'    => null,
                        'apps'          => null,
                        'community'     => null,
                        'home'          => null,
-                       'events'        => null,
+                       'calendar'      => null,
                        'login'         => null,
                        'logout'        => null,
                        'langselector'  => null,
@@ -191,9 +192,9 @@ class Nav
                        // user menu
                        $nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
                        $nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
-                       $nav['usermenu'][] = ['photos/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
+                       $nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/photos', DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
                        $nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/media', DI::l10n()->t('Media'), '', DI::l10n()->t('Your postings with media')];
-                       $nav['usermenu'][] = ['events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')];
+                       $nav['usermenu'][] = ['calendar/', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Your calendar')];
                        $nav['usermenu'][] = ['notes/', DI::l10n()->t('Personal notes'), '', DI::l10n()->t('Your personal notes')];
 
                        // user info
@@ -243,12 +244,8 @@ class Nav
                }
 
                $gdirpath = 'directory';
-
-               if (strlen(DI::config()->get('system', 'singleuser'))) {
-                       $gdir = DI::config()->get('system', 'directory');
-                       if (strlen($gdir)) {
-                               $gdirpath = Profile::zrl($gdir, true);
-                       }
+               if (DI::config()->get('system', 'singleuser') && DI::config()->get('system', 'directory')) {
+                       $gdirpath = Profile::zrl(DI::config()->get('system', 'directory'), true);
                }
 
                if ((DI::userSession()->getLocalUserId() || DI::config()->get('system', 'community_page_style') != Community::DISABLED_VISITOR) &&
@@ -257,7 +254,7 @@ class Nav
                }
 
                if (DI::userSession()->getLocalUserId()) {
-                       $nav['events'] = ['events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')];
+                       $nav['calendar'] = ['calendar', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Calendar')];
                }
 
                $nav['directory'] = [$gdirpath, DI::l10n()->t('Directory'), '', DI::l10n()->t('People directory')];
@@ -287,7 +284,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 (User::hasIdentities(DI::session()->get('submanage') ?: DI::userSession()->getLocalUserId())) {
+                       if (User::hasIdentities(DI::userSession()->getSubManagedUserId() ?: DI::userSession()->getLocalUserId())) {
                                $nav['delegation'] = ['delegation', DI::l10n()->t('Accounts'), '', DI::l10n()->t('Manage other pages')];
                        }
 
@@ -298,7 +295,8 @@ class Nav
 
                // Show the link to the admin configuration page if user is admin
                if ($a->isSiteAdmin()) {
-                       $nav['admin'] = ['admin/', DI::l10n()->t('Admin'), '', DI::l10n()->t('Site setup and configuration')];
+                       $nav['admin']      = ['admin/', DI::l10n()->t('Admin'), '', DI::l10n()->t('Site setup and configuration')];
+                       $nav['moderation'] = ['moderation/', DI::l10n()->t('Moderation'), '', DI::l10n()->t('Content and user moderation')];
                }
 
                $nav['navigation'] = ['navigation/', DI::l10n()->t('Navigation'), '', DI::l10n()->t('Site map')];