X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FNav.php;h=77f068863aa3ca2a29bf19e12ac2f98408d9528e;hb=e69b04d2df9726cd43a7c801febe8e4f7668f790;hp=20b3a93258636582eb8db614b9cf6b9dacb37de7;hpb=69c75daf4f9173573bcfece08a1040612de88c1d;p=friendica.git diff --git a/src/Content/Nav.php b/src/Content/Nav.php index 20b3a93258..77f068863a 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -1,6 +1,6 @@ '; @@ -106,7 +106,7 @@ class Nav * * @return array */ - public static function getAppMenu() + public static function getAppMenu(): array { if (is_null(self::$app_menu)) { self::populateAppMenu(); @@ -117,6 +117,8 @@ class Nav /** * Fills the apps static variable with apps that require a menu + * + * @return void */ private static function populateAppMenu() { @@ -154,7 +156,7 @@ class Nav * Display the current site location as a navigation aid. */ - $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : ''); + $myident = !empty($a->getLoggedInUserNickname()) ? $a->getLoggedInUserNickname() . '@' : ''; $sitelocation = $myident . substr(DI::baseUrl()->get($ssl_state), strpos(DI::baseUrl()->get($ssl_state), '//') + 2); @@ -182,28 +184,24 @@ class Nav if (Session::isAuthenticated()) { $nav['logout'] = ['logout', DI::l10n()->t('Logout'), '', DI::l10n()->t('End this session')]; } else { - $nav['login'] = ['login', DI::l10n()->t('Login'), (DI::module()->getName() == 'login' ? 'selected' : ''), DI::l10n()->t('Sign in')]; + $nav['login'] = ['login', DI::l10n()->t('Login'), (DI::args()->getModuleName() == 'login' ? 'selected' : ''), DI::l10n()->t('Sign in')]; } - if (local_user()) { - if (!empty($a->user)) { - // user menu - $nav['usermenu'][] = ['profile/' . $a->user['nickname'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')]; - $nav['usermenu'][] = ['profile/' . $a->user['nickname'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')]; - $nav['usermenu'][] = ['photos/' . $a->user['nickname'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')]; - $nav['usermenu'][] = ['videos/' . $a->user['nickname'], DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')]; - $nav['usermenu'][] = ['events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')]; - $nav['usermenu'][] = ['notes/', DI::l10n()->t('Personal notes'), '', DI::l10n()->t('Your personal notes')]; - - // user info - $contact = DBA::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]); - $userinfo = [ - 'icon' => (DBA::isResult($contact) ? DI::baseUrl()->remove($contact['micro']) : Contact::DEFAULT_AVATAR_MICRO), - 'name' => $a->user['username'], - ]; - } else { - DI::logger()->warning('Empty $a->user for local user', ['local_user' => local_user(), '$a' => $a]); - } + if ($a->isLoggedIn()) { + // 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() . '/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'][] = ['notes/', DI::l10n()->t('Personal notes'), '', DI::l10n()->t('Your personal notes')]; + + // user info + $contact = DBA::selectFirst('contact', ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl', 'updated'], ['uid' => $a->getLoggedInUserId(), 'self' => true]); + $userinfo = [ + 'icon' => Contact::getMicro($contact), + 'name' => $contact['name'], + ]; } // "Home" should also take you home from an authenticated remote profile connection @@ -212,7 +210,7 @@ class Nav $homelink = Session::get('visitor_home', ''); } - if ((DI::module()->getName() != 'home') && (! (local_user()))) { + if ((DI::args()->getModuleName() != 'home') && (! (local_user()))) { $nav['home'] = [$homelink, DI::l10n()->t('Home'), '', DI::l10n()->t('Home Page')]; } @@ -271,17 +269,17 @@ class Nav } // The following nav links are only show to logged in users - if (local_user() && !empty($a->user)) { + if (local_user() && !empty($a->getLoggedInUserNickname())) { $nav['network'] = ['network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')]; - $nav['home'] = ['profile/' . $a->user['nickname'], DI::l10n()->t('Home'), '', DI::l10n()->t('Your posts and conversations')]; + $nav['home'] = ['profile/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Home'), '', DI::l10n()->t('Your posts and conversations')]; // Don't show notifications for public communities if (Session::get('page_flags', '') != User::PAGE_FLAGS_COMMUNITY) { $nav['introductions'] = ['notifications/intros', DI::l10n()->t('Introductions'), '', DI::l10n()->t('Friend Requests')]; $nav['notifications'] = ['notifications', DI::l10n()->t('Notifications'), '', DI::l10n()->t('Notifications')]; $nav['notifications']['all'] = ['notifications/system', DI::l10n()->t('See all notifications'), '', '']; - $nav['notifications']['mark'] = ['', DI::l10n()->t('Mark as seen'), '', DI::l10n()->t('Mark all system notifications seen')]; + $nav['notifications']['mark'] = ['', DI::l10n()->t('Mark as seen'), '', DI::l10n()->t('Mark all system notifications as seen')]; } $nav['messages'] = ['message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')]; @@ -299,7 +297,7 @@ class Nav } // Show the link to the admin configuration page if user is admin - if (is_site_admin()) { + if ($a->isSiteAdmin()) { $nav['admin'] = ['admin/', DI::l10n()->t('Admin'), '', DI::l10n()->t('Site setup and configuration')]; } @@ -308,7 +306,7 @@ class Nav // Provide a banner/logo/whatever $banner = DI::config()->get('system', 'banner'); if (is_null($banner)) { - $banner = 'logoFriendica'; + $banner = 'logoFriendica'; } $nav_info = [