Merge pull request #8139 from MrPetovan/bug/notices

[friendica.git] / src / Content / Nav.php

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 6fca7beb91e2bc8ba71b0e9c8c6c507bd7361da1..2cb47710295c2dba9353fffc2033f12695d2cfda 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -10,7 +10,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Profile;
@@ -120,7 +119,6 @@ class Nav
        /**
         * Prepares a list of navigation links
         *
-        * @brief Prepares a list of navigation links
         * @param  App   $a
         * @return array Navigation links
         *    string 'sitelocation' => The webbie (username@site.com)
@@ -141,7 +139,7 @@ class Nav
 
                $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
 
-               $sitelocation = $myident . substr(System::baseUrl($ssl_state), strpos(System::baseUrl($ssl_state), '//') + 2);
+               $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 = [];
@@ -153,7 +151,7 @@ class Nav
                if (Session::isAuthenticated()) {
                        $nav['logout'] = ['logout', L10n::t('Logout'), '', L10n::t('End this session')];
                } else {
-                       $nav['login'] = ['login', L10n::t('Login'), ($a->module == 'login' ? 'selected' : ''), L10n::t('Sign in')];
+                       $nav['login'] = ['login', L10n::t('Login'), (DI::module()->getName() == 'login' ? 'selected' : ''), L10n::t('Sign in')];
                }
 
                if (local_user()) {
@@ -179,7 +177,7 @@ class Nav
                        $homelink = Session::get('visitor_home', '');
                }
 
-               if (($a->module != 'home') && (! (local_user()))) {
+               if ((DI::module()->getName() != 'home') && (! (local_user()))) {
                        $nav['home'] = [$homelink, L10n::t('Home'), '', L10n::t('Home Page')];
                }
 
@@ -240,7 +238,6 @@ class Nav
                // The following nav links are only show to logged in users
                if (local_user()) {
                        $nav['network'] = ['network', L10n::t('Network'), '', L10n::t('Conversations from your friends')];
-                       $nav['net_reset'] = ['network/?f=', L10n::t('Network Reset'), '', L10n::t('Load Network page with no filters')];
 
                        $nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];