X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FNav.php;h=77f068863aa3ca2a29bf19e12ac2f98408d9528e;hb=e69b04d2df9726cd43a7c801febe8e4f7668f790;hp=90822c7e6fed3fb2bb7c7e6364b41e650046973a;hpb=516018861e011865a902587876d484d6f0f42a66;p=friendica.git

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 90822c7e6f..77f068863a 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -62,7 +62,7 @@ class Nav
 	 *
 	 * @param string $item
 	 */
-	public static function setSelected($item)
+	public static function setSelected(string $item)
 	{
 		self::$selected[$item] = 'selected';
 	}
@@ -74,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>';
@@ -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()
 	{
@@ -182,7 +184,7 @@ 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 ($a->isLoggedIn()) {
@@ -208,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')];
 		}
 
@@ -277,7 +279,7 @@ class Nav
 				$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')];
@@ -295,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')];
 		}
 
@@ -304,7 +306,7 @@ 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>';
 		}
 
 		$nav_info = [