X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FContent%2FNav.php;h=1eae2a3e3b4ba98651bfe15e04b38e3c81831111;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=b8691e93400ee53aeeac2f18f61bb8fd5113bd85;hpb=8821d33f73785884cfce83e7b23d3ef19cc1bc11;p=friendica.git diff --git a/src/Content/Nav.php b/src/Content/Nav.php index b8691e9340..1eae2a3e3b 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -5,18 +5,14 @@ namespace Friendica\Content; use Friendica\App; -use Friendica\Content\Feature; -use Friendica\Core\Addon; use Friendica\Core\Config; +use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; -use Friendica\Model\Contact; use Friendica\Model\Profile; - -require_once 'boot.php'; -require_once 'include/text.php'; +use Friendica\Model\User; class Nav { @@ -46,6 +42,8 @@ class Nav /** * Set a menu item in navbar as selected + * + * @param string $item */ public static function setSelected($item) { @@ -54,11 +52,15 @@ class Nav /** * Build page header and site navigation bars + * + * @param App $a + * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function build(App $a) { // Placeholder div for popup panel - $nav = '
' ; + $nav = ''; $nav_info = self::getInfo($a); @@ -77,7 +79,7 @@ class Nav '$search_hint' => L10n::t('@name, !forum, #tags, content') ]); - Addon::callHooks('page_header', $nav); + Hook::callAll('page_header', $nav); return $nav; } @@ -108,7 +110,7 @@ class Nav if (local_user() || !$privateapps) { $arr = ['app_menu' => self::$app_menu]; - Addon::callHooks('app_menu', $arr); + Hook::callAll('app_menu', $arr); self::$app_menu = $arr['app_menu']; } @@ -118,12 +120,13 @@ class Nav * Prepares a list of navigation links * * @brief Prepares a list of navigation links - * @param App $a + * @param App $a * @return array Navigation links - * string 'sitelocation' => The webbie (username@site.com) - * array 'nav' => Array of links used in the nav menu - * string 'banner' => Formatted html link with banner image - * array 'userinfo' => Array of user information (name, icon) + * string 'sitelocation' => The webbie (username@site.com) + * array 'nav' => Array of links used in the nav menu + * string 'banner' => Formatted html link with banner image + * array 'userinfo' => Array of user information (name, icon) + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function getInfo(App $a) { @@ -170,14 +173,14 @@ class Nav // "Home" should also take you home from an authenticated remote profile connection $homelink = Profile::getMyURL(); if (! $homelink) { - $homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : ''); + $homelink = defaults($_SESSION, 'visitor_home', ''); } if (($a->module != 'home') && (! (local_user()))) { $nav['home'] = [$homelink, L10n::t('Home'), '', L10n::t('Home Page')]; } - if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN && !local_user() && !remote_user()) { + if (intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::OPEN && !local_user() && !remote_user()) { $nav['register'] = ['register', L10n::t('Register'), '', L10n::t('Create an account')]; } @@ -234,12 +237,12 @@ 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/0?f=&order=comment&nets=all', L10n::t('Network Reset'), '', L10n::t('Load Network page with no filters')]; + $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')]; // Don't show notifications for public communities - if (defaults($_SESSION, 'page_flags', '') != Contact::PAGE_COMMUNITY) { + if (defaults($_SESSION, 'page_flags', '') != User::PAGE_FLAGS_COMMUNITY) { $nav['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')]; $nav['notifications'] = ['notifications', L10n::t('Notifications'), '', L10n::t('Notifications')]; $nav['notifications']['all'] = ['notifications/system', L10n::t('See all notifications'), '', '']; @@ -279,7 +282,7 @@ class Nav $banner = '