X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FNav.php;h=0000b3d2962f3b35c390d61fb3f0fba195937f41;hb=2edbd1a3e2b90430b378de32f79a7cbd3537d9de;hp=37bf0817529e539f88b6f8d53d121f01c6fe317a;hpb=d09b3f5bdeae444f785f6283e55dbf2f61caadac;p=friendica.git

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 37bf081752..0000b3d296 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,11 +24,12 @@ namespace Friendica\Content;
 use Friendica\App;
 use Friendica\Core\Hook;
 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;
+use Friendica\Module\Conversation\Community;
 
 class Nav
 {
@@ -45,7 +46,7 @@ class Nav
 		'settings'  => null,
 		'contacts'  => null,
 		'delegation'=> null,
-		'events'    => null,
+		'calendar'  => null,
 		'register'  => null
 	];
 
@@ -61,7 +62,7 @@ class Nav
 	 *
 	 * @param string $item
 	 */
-	public static function setSelected($item)
+	public static function setSelected(string $item)
 	{
 		self::$selected[$item] = 'selected';
 	}
@@ -73,7 +74,7 @@ class Nav
 	 * @return string
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function build(App $a)
+	public static function build(App $a): string
 	{
 		// Placeholder div for popup panel
 		$nav = '<div id="panel" style="display: none;"></div>';
@@ -105,7 +106,7 @@ class Nav
 	 *
 	 * @return array
 	 */
-	public static function getAppMenu()
+	public static function getAppMenu(): array
 	{
 		if (is_null(self::$app_menu)) {
 			self::populateAppMenu();
@@ -116,6 +117,8 @@ class Nav
 
 	/**
 	 * Fills the apps static variable with apps that require a menu
+	 *
+	 * @return void
 	 */
 	private static function populateAppMenu()
 	{
@@ -123,7 +126,7 @@ class Nav
 
 		//Don't populate apps_menu if apps are private
 		$privateapps = DI::config()->get('config', 'private_addons', false);
-		if (local_user() || !$privateapps) {
+		if (DI::userSession()->getLocalUserId() || !$privateapps) {
 			$arr = ['app_menu' => self::$app_menu];
 
 			Hook::callAll('app_menu', $arr);
@@ -143,9 +146,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) DI::userSession()->getLocalUserId();
 
 		/*
 		 * Our network is distributed, and as you visit friends some of the
@@ -153,51 +156,66 @@ 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,
+			'moderation'    => null,
+			'apps'          => null,
+			'community'     => null,
+			'home'          => null,
+			'calendar'      => 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;
 
-		if (Session::isAuthenticated()) {
+		// nav links: array of array('href', 'text', 'extra css classes', 'title')
+		if (DI::userSession()->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'] . '/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'][] = ['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'][] = ['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
-			$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'],
 			];
 		}
 
 		// "Home" should also take you home from an authenticated remote profile connection
 		$homelink = Profile::getMyURL();
 		if (! $homelink) {
-			$homelink = Session::get('visitor_home', '');
+			$homelink = DI::session()->get('visitor_home', '');
 		}
 
-		if ((DI::module()->getName() != 'home') && (! (local_user()))) {
+		if (DI::args()->getModuleName() != 'home' && ! DI::userSession()->getLocalUserId()) {
 			$nav['home'] = [$homelink, DI::l10n()->t('Home'), '', DI::l10n()->t('Home Page')];
 		}
 
-		if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::OPEN && !Session::isAuthenticated()) {
+		if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::OPEN && !DI::userSession()->isAuthenticated()) {
 			$nav['register'] = ['register', DI::l10n()->t('Register'), '', DI::l10n()->t('Create an account')];
 		}
 
@@ -211,7 +229,7 @@ class Nav
 			$nav['apps'] = ['apps', DI::l10n()->t('Apps'), '', DI::l10n()->t('Addon applications, utilities, games')];
 		}
 
-		if (local_user() || !DI::config()->get('system', 'local_search')) {
+		if (DI::userSession()->getLocalUserId() || !DI::config()->get('system', 'local_search')) {
 			$nav['search'] = ['search', DI::l10n()->t('Search'), '', DI::l10n()->t('Search site content')];
 
 			$nav['searchoption'] = [
@@ -234,13 +252,13 @@ class Nav
 			}
 		}
 
-		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)) {
+		if ((DI::userSession()->getLocalUserId() || DI::config()->get('system', 'community_page_style') != Community::DISABLED_VISITOR) &&
+			!(DI::config()->get('system', 'community_page_style') == Community::DISABLED)) {
 			$nav['community'] = ['community', DI::l10n()->t('Community'), '', DI::l10n()->t('Conversations on this and other servers')];
 		}
 
-		if (local_user()) {
-			$nav['events'] = ['events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')];
+		if (DI::userSession()->getLocalUserId()) {
+			$nav['calendar'] = ['calendar', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Calendar')];
 		}
 
 		$nav['directory'] = [$gdirpath, DI::l10n()->t('Directory'), '', DI::l10n()->t('People directory')];
@@ -252,17 +270,17 @@ class Nav
 		}
 
 		// The following nav links are only show to logged in users
-		if (local_user()) {
+		if (DI::userSession()->getLocalUserId() && !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) {
+			if (DI::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')];
@@ -270,8 +288,8 @@ 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::userSession()->getSubManagedUserId() ?: DI::userSession()->getLocalUserId())) {
+				$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')];
@@ -280,8 +298,9 @@ class Nav
 		}
 
 		// Show the link to the admin configuration page if user is admin
-		if (is_site_admin()) {
-			$nav['admin'] = ['admin/', DI::l10n()->t('Admin'), '', DI::l10n()->t('Site setup and configuration')];
+		if ($a->isSiteAdmin()) {
+			$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')];
@@ -289,16 +308,18 @@ class Nav
 		// Provide a banner/logo/whatever
 		$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>';
+			$banner = '<a href="https://friendi.ca"><img id="logo-img" width="32" height="32" src="images/friendica.svg" 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;
 	}
 }