X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FNav.php;h=2bba14baf9a3b9b1780cf2acb7eeae0ebd332ee0;hb=e56a53647bd5469551bf4f9ef2df50a5dd16b943;hp=30e4a1c0872df48f9bd3ca0bf2c433db2e2b6211;hpb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;p=friendica.git

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 30e4a1c087..2bba14baf9 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -1,17 +1,33 @@
 <?php
 /**
- * @file src/Content/Nav.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Content;
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
 
@@ -75,6 +91,7 @@ class Nav
 			'$userinfo'     => $nav_info['userinfo'],
 			'$sel'          => self::$selected,
 			'$apps'         => self::getAppMenu(),
+			'$home'         => DI::l10n()->t('Go back'),
 			'$clear_notifs' => DI::l10n()->t('Clear notifications'),
 			'$search_hint'  => DI::l10n()->t('@name, !forum, #tags, content')
 		]);
@@ -106,7 +123,7 @@ class Nav
 		self::$app_menu = [];
 
 		//Don't populate apps_menu if apps are private
-		$privateapps = Config::get('config', 'private_addons', false);
+		$privateapps = DI::config()->get('config', 'private_addons', false);
 		if (local_user() || !$privateapps) {
 			$arr = ['app_menu' => self::$app_menu];
 
@@ -127,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
@@ -137,37 +154,51 @@ 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')];
+			$nav['login'] = ['login', DI::l10n()->t('Login'), (DI::args()->getModuleName() == 'login' ? 'selected' : ''), DI::l10n()->t('Sign in')];
 		}
 
-		if (local_user()) {
+		if ($a->isLoggedIn()) {
 			// 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'] . '?tab=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'][] = ['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', ['micro'], ['uid' => $a->user['uid'], 'self' => true]);
+			$contact = DBA::selectFirst('contact', ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl', 'updated'], ['uid' => $a->getLoggedInUserId(), 'self' => true]);
 			$userinfo = [
-				'icon' => (DBA::isResult($contact) ? DI::baseUrl()->remove($contact['micro']) : 'images/person-48.jpg'),
-				'name' => $a->user['username'],
+				'icon' => Contact::getMicro($contact),
+				'name' => $contact['name'],
 			];
 		}
 
@@ -177,17 +208,17 @@ 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')];
 		}
 
-		if (intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::OPEN && !Session::isAuthenticated()) {
+		if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::OPEN && !Session::isAuthenticated()) {
 			$nav['register'] = ['register', DI::l10n()->t('Register'), '', DI::l10n()->t('Create an account')];
 		}
 
 		$help_url = 'help';
 
-		if (!Config::get('system', 'hide_help')) {
+		if (!DI::config()->get('system', 'hide_help')) {
 			$nav['help'] = [$help_url, DI::l10n()->t('Help'), '', DI::l10n()->t('Help and documentation')];
 		}
 
@@ -195,7 +226,7 @@ class Nav
 			$nav['apps'] = ['apps', DI::l10n()->t('Apps'), '', DI::l10n()->t('Addon applications, utilities, games')];
 		}
 
-		if (local_user() || !Config::get('system', 'local_search')) {
+		if (local_user() || !DI::config()->get('system', 'local_search')) {
 			$nav['search'] = ['search', DI::l10n()->t('Search'), '', DI::l10n()->t('Search site content')];
 
 			$nav['searchoption'] = [
@@ -204,22 +235,22 @@ class Nav
 				DI::l10n()->t('Contacts')
 			];
 
-			if (Config::get('system', 'poco_local_search')) {
+			if (DI::config()->get('system', 'poco_local_search')) {
 				$nav['searchoption'][] = DI::l10n()->t('Forums');
 			}
 		}
 
 		$gdirpath = 'directory';
 
-		if (strlen(Config::get('system', 'singleuser'))) {
-			$gdir = Config::get('system', 'directory');
+		if (strlen(DI::config()->get('system', 'singleuser'))) {
+			$gdir = DI::config()->get('system', 'directory');
 			if (strlen($gdir)) {
 				$gdirpath = Profile::zrl($gdir, true);
 			}
 		}
 
-		if ((local_user() || Config::get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) &&
-			!(Config::get('system', 'community_page_style') == CP_NO_INTERNAL_COMMUNITY)) {
+		if ((local_user() || DI::config()->get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) &&
+			!(DI::config()->get('system', 'community_page_style') == CP_NO_INTERNAL_COMMUNITY)) {
 			$nav['community'] = ['community', DI::l10n()->t('Community'), '', DI::l10n()->t('Conversations on this and other servers')];
 		}
 
@@ -231,15 +262,15 @@ class Nav
 
 		$nav['about'] = ['friendica', DI::l10n()->t('Information'), '', DI::l10n()->t('Information about this friendica instance')];
 
-		if (Config::get('system', 'tosdisplay')) {
+		if (DI::config()->get('system', 'tosdisplay')) {
 			$nav['tos'] = ['tos', DI::l10n()->t('Terms of Service'), '', DI::l10n()->t('Terms of Service of this Friendica instance')];
 		}
 
 		// The following nav links are only show to logged in users
-		if (local_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) {
@@ -254,39 +285,37 @@ 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) {
-				$nav['delegation'] = ['delegation', DI::l10n()->t('Delegation'), '', DI::l10n()->t('Manage other pages')];
+			if (User::hasIdentities(DI::session()->get('submanage') ?: local_user())) {
+				$nav['delegation'] = ['delegation', DI::l10n()->t('Accounts'), '', DI::l10n()->t('Manage other pages')];
 			}
 
 			$nav['settings'] = ['settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')];
 
-			if (Feature::isEnabled(local_user(), 'multi_profiles')) {
-				$nav['profiles'] = ['profiles', DI::l10n()->t('Profiles'), '', DI::l10n()->t('Manage/Edit Profiles')];
-			}
-
 			$nav['contacts'] = ['contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')];
 		}
 
 		// 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')];
 		}
 
 		$nav['navigation'] = ['navigation/', DI::l10n()->t('Navigation'), '', DI::l10n()->t('Site map')];
 
 		// Provide a banner/logo/whatever
-		$banner = Config::get('system', 'banner');
+		$banner = DI::config()->get('system', 'banner');
 		if (is_null($banner)) {
 			$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;
 	}
 }