X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FNav.php;h=db3eddfe2312c9ef11868152a329e97aeb48fcf2;hb=68046573a4171dcbd5db75a991487bafa4b4370f;hp=01eac67335bf418fb88a937e2920feed1e616bef;hpb=38a5358bfa646ae13a4a1a385741890fa88d9b7f;p=friendica.git
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 01eac67335..db3eddfe23 100644
--- 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
@@ -154,42 +154,52 @@ 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);
- // 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 {
$nav['login'] = ['login', DI::l10n()->t('Login'), (DI::module()->getName() == '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'][] = ['media/' . $a->getLoggedInUserNickname(), 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
@@ -257,10 +267,10 @@ 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) {
@@ -275,7 +285,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 +307,15 @@ class Nav
$banner = '
Friendica';
}
- 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;
}
}