X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FContent%2FNav.php;h=ea5c0bbc05230c77984392b5171f1f2846383825;hb=7b4bba66dbb122585e6c7e844d636d62b704ea38;hp=5166d5848e1463ba1dd8eb424339e2ce3ba67339;hpb=57695d48b41b5dba9a4ec1e97b531ff6590d8845;p=friendica.git
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 5166d5848e..ea5c0bbc05 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -5,18 +5,15 @@
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\Session;
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 +43,8 @@ class Nav
/**
* Set a menu item in navbar as selected
+ *
+ * @param string $item
*/
public static function setSelected($item)
{
@@ -54,6 +53,10 @@ 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)
{
@@ -65,7 +68,6 @@ class Nav
$tpl = Renderer::getMarkupTemplate('nav.tpl');
$nav .= Renderer::replaceMacros($tpl, [
- '$baseurl' => System::baseUrl(),
'$sitelocation' => $nav_info['sitelocation'],
'$nav' => $nav_info['nav'],
'$banner' => $nav_info['banner'],
@@ -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)
{
@@ -146,9 +149,13 @@ class Nav
$nav['usermenu'] = [];
$userinfo = null;
- if (local_user()) {
+ if (local_user() || remote_user()) {
$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')];
+ }
+ if (local_user()) {
// user menu
$nav['usermenu'][] = ['profile/' . $a->user['nickname'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
$nav['usermenu'][] = ['profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];
@@ -163,21 +170,19 @@ class Nav
'icon' => (DBA::isResult($contact) ? $a->removeBaseURL($contact['micro']) : 'images/person-48.jpg'),
'name' => $a->user['username'],
];
- } else {
- $nav['login'] = ['login', L10n::t('Login'), ($a->module == 'login' ? 'selected' : ''), L10n::t('Sign in')];
}
// "Home" should also take you home from an authenticated remote profile connection
$homelink = Profile::getMyURL();
if (! $homelink) {
- $homelink = defaults($_SESSION, 'visitor_home', '');
+ $homelink = Session::get('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')];
}
@@ -239,7 +244,7 @@ class Nav
$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 (Session::get('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 +284,7 @@ class Nav
$banner = '
Friendica';
}
- Addon::callHooks('nav_info', $nav);
+ Hook::callAll('nav_info', $nav);
return [
'sitelocation' => $sitelocation,