X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FNav.php;h=8f565cc3d241e625ef1af87983f259a4f5425fcb;hb=0b8fd92e1eeb8229afb2aaf31b072c2a1fa51af7;hp=5c347c2a761b409791b65a9a520c2986ebbd6a8d;hpb=91facd2d0a2869e2c26a5943d8afe1849d3891f8;p=friendica.git
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 5c347c2a76..8f565cc3d2 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -5,18 +5,13 @@
namespace Friendica\Content;
use Friendica\App;
-use Friendica\Content\Feature;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\Core\Session;
use Friendica\Database\DBA;
-use Friendica\Model\Contact;
+use Friendica\DI;
use Friendica\Model\Profile;
-
-require_once 'boot.php';
-require_once 'include/text.php';
+use Friendica\Model\User;
class Nav
{
@@ -32,7 +27,7 @@ class Nav
'directory' => null,
'settings' => null,
'contacts' => null,
- 'manage' => null,
+ 'delegation'=> null,
'events' => null,
'register' => null
];
@@ -46,6 +41,8 @@ class Nav
/**
* Set a menu item in navbar as selected
+ *
+ * @param string $item
*/
public static function setSelected($item)
{
@@ -54,30 +51,33 @@ 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);
- $tpl = get_markup_template('nav.tpl');
+ $tpl = Renderer::getMarkupTemplate('nav.tpl');
$nav .= Renderer::replaceMacros($tpl, [
- '$baseurl' => System::baseUrl(),
'$sitelocation' => $nav_info['sitelocation'],
'$nav' => $nav_info['nav'],
'$banner' => $nav_info['banner'],
- '$emptynotifications' => L10n::t('Nothing new here'),
+ '$emptynotifications' => DI::l10n()->t('Nothing new here'),
'$userinfo' => $nav_info['userinfo'],
'$sel' => self::$selected,
'$apps' => self::getAppMenu(),
- '$clear_notifs' => L10n::t('Clear notifications'),
- '$search_hint' => L10n::t('@name, !forum, #tags, content')
+ '$clear_notifs' => DI::l10n()->t('Clear notifications'),
+ '$search_hint' => DI::l10n()->t('@name, !forum, #tags, content')
]);
- Addon::callHooks('page_header', $nav);
+ Hook::callAll('page_header', $nav);
return $nav;
}
@@ -104,11 +104,11 @@ class Nav
self::$app_menu = [];
//Don't populate apps_menu if apps are private
- $privateapps = Config::get('config', 'private_addons', false);
+ $privateapps = DI::config()->get('config', 'private_addons', false);
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'];
}
@@ -117,13 +117,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)
{
@@ -137,7 +137,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 = [];
@@ -146,140 +146,135 @@ class Nav
$nav['usermenu'] = [];
$userinfo = null;
- if (local_user()) {
- $nav['logout'] = ['logout', L10n::t('Logout'), '', L10n::t('End this session')];
+ 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')];
+ }
+ 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')];
- $nav['usermenu'][] = ['photos/' . $a->user['nickname'], L10n::t('Photos'), '', L10n::t('Your photos')];
- $nav['usermenu'][] = ['videos/' . $a->user['nickname'], L10n::t('Videos'), '', L10n::t('Your videos')];
- $nav['usermenu'][] = ['events/', L10n::t('Events'), '', L10n::t('Your events')];
- $nav['usermenu'][] = ['notes/', L10n::t('Personal notes'), '', L10n::t('Your personal notes')];
+ $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'][] = ['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]);
$userinfo = [
- 'icon' => (DBA::isResult($contact) ? $a->removeBaseURL($contact['micro']) : 'images/person-48.jpg'),
+ 'icon' => (DBA::isResult($contact) ? DI::baseUrl()->remove($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 = ((x($_SESSION, 'visitor_home')) ? $_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 ((DI::module()->getName() != 'home') && (! (local_user()))) {
+ $nav['home'] = [$homelink, DI::l10n()->t('Home'), '', DI::l10n()->t('Home Page')];
}
- if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN && !local_user() && !remote_user()) {
- $nav['register'] = ['register', L10n::t('Register'), '', L10n::t('Create an account')];
+ if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::OPEN && !Session::isAuthenticated()) {
+ $nav['register'] = ['register', DI::l10n()->t('Register'), '', DI::l10n()->t('Create an account')];
}
$help_url = 'help';
- if (!Config::get('system', 'hide_help')) {
- $nav['help'] = [$help_url, L10n::t('Help'), '', L10n::t('Help and documentation')];
+ if (!DI::config()->get('system', 'hide_help')) {
+ $nav['help'] = [$help_url, DI::l10n()->t('Help'), '', DI::l10n()->t('Help and documentation')];
}
if (count(self::getAppMenu()) > 0) {
- $nav['apps'] = ['apps', L10n::t('Apps'), '', L10n::t('Addon applications, utilities, games')];
+ $nav['apps'] = ['apps', DI::l10n()->t('Apps'), '', DI::l10n()->t('Addon applications, utilities, games')];
}
- if (local_user() || !Config::get('system', 'local_search')) {
- $nav['search'] = ['search', L10n::t('Search'), '', L10n::t('Search site content')];
+ if (local_user() || !DI::config()->get('system', 'local_search')) {
+ $nav['search'] = ['search', DI::l10n()->t('Search'), '', DI::l10n()->t('Search site content')];
$nav['searchoption'] = [
- L10n::t('Full Text'),
- L10n::t('Tags'),
- L10n::t('Contacts')
+ DI::l10n()->t('Full Text'),
+ DI::l10n()->t('Tags'),
+ DI::l10n()->t('Contacts')
];
- if (Config::get('system', 'poco_local_search')) {
- $nav['searchoption'][] = L10n::t('Forums');
+ if (DI::config()->get('system', 'poco_local_search')) {
+ $nav['searchoption'][] = DI::l10n()->t('Forums');
}
}
$gdirpath = 'directory';
- if (strlen(Config::get('system', 'singleuser'))) {
- $gdir = Config::get('system', 'directory');
+ if (strlen(DI::config()->get('system', 'singleuser'))) {
+ $gdir = DI::config()->get('system', 'directory');
if (strlen($gdir)) {
$gdirpath = Profile::zrl($gdir, true);
}
}
- if ((local_user() || Config::get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) &&
- !(Config::get('system', 'community_page_style') == CP_NO_INTERNAL_COMMUNITY)) {
- $nav['community'] = ['community', L10n::t('Community'), '', L10n::t('Conversations on this and other servers')];
+ 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)) {
+ $nav['community'] = ['community', DI::l10n()->t('Community'), '', DI::l10n()->t('Conversations on this and other servers')];
}
if (local_user()) {
- $nav['events'] = ['events', L10n::t('Events'), '', L10n::t('Events and Calendar')];
+ $nav['events'] = ['events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')];
}
- $nav['directory'] = [$gdirpath, L10n::t('Directory'), '', L10n::t('People directory')];
+ $nav['directory'] = [$gdirpath, DI::l10n()->t('Directory'), '', DI::l10n()->t('People directory')];
- $nav['about'] = ['friendica', L10n::t('Information'), '', L10n::t('Information about this friendica instance')];
+ $nav['about'] = ['friendica', DI::l10n()->t('Information'), '', DI::l10n()->t('Information about this friendica instance')];
- if (Config::get('system', 'tosdisplay')) {
- $nav['tos'] = ['tos', L10n::t('Terms of Service'), '', L10n::t('Terms of Service of this Friendica instance')];
+ if (DI::config()->get('system', 'tosdisplay')) {
+ $nav['tos'] = ['tos', DI::l10n()->t('Terms of Service'), '', DI::l10n()->t('Terms of Service of this Friendica instance')];
}
// 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['network'] = ['network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')];
- $nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];
+ $nav['home'] = ['profile/' . $a->user['nickname'], DI::l10n()->t('Home'), '', DI::l10n()->t('Your posts and conversations')];
// Don't show notifications for public communities
- if (defaults($_SESSION, 'page_flags', '') != Contact::PAGE_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'), '', ''];
- $nav['notifications']['mark'] = ['', L10n::t('Mark as seen'), '', L10n::t('Mark all system notifications seen')];
+ if (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['messages'] = ['message', L10n::t('Messages'), '', L10n::t('Private mail')];
- $nav['messages']['inbox'] = ['message', L10n::t('Inbox'), '', L10n::t('Inbox')];
- $nav['messages']['outbox'] = ['message/sent', L10n::t('Outbox'), '', L10n::t('Outbox')];
- $nav['messages']['new'] = ['message/new', L10n::t('New Message'), '', L10n::t('New Message')];
+ $nav['messages'] = ['message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')];
+ $nav['messages']['inbox'] = ['message', DI::l10n()->t('Inbox'), '', DI::l10n()->t('Inbox')];
+ $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['manage'] = ['manage', L10n::t('Manage'), '', L10n::t('Manage other pages')];
+ $nav['delegation'] = ['delegation', DI::l10n()->t('Delegation'), '', DI::l10n()->t('Manage other pages')];
}
- $nav['delegations'] = ['delegate', L10n::t('Delegations'), '', L10n::t('Delegate Page Management')];
-
- $nav['settings'] = ['settings', L10n::t('Settings'), '', L10n::t('Account settings')];
-
- if (Feature::isEnabled(local_user(), 'multi_profiles')) {
- $nav['profiles'] = ['profiles', L10n::t('Profiles'), '', L10n::t('Manage/Edit Profiles')];
- }
+ $nav['settings'] = ['settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')];
- $nav['contacts'] = ['contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
+ $nav['contacts'] = ['contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')];
}
// Show the link to the admin configuration page if user is admin
if (is_site_admin()) {
- $nav['admin'] = ['admin/', L10n::t('Admin'), '', L10n::t('Site setup and configuration')];
+ $nav['admin'] = ['admin/', DI::l10n()->t('Admin'), '', DI::l10n()->t('Site setup and configuration')];
}
- $nav['navigation'] = ['navigation/', L10n::t('Navigation'), '', L10n::t('Site map')];
+ $nav['navigation'] = ['navigation/', DI::l10n()->t('Navigation'), '', DI::l10n()->t('Site map')];
// Provide a banner/logo/whatever
- $banner = Config::get('system', 'banner');
+ $banner = DI::config()->get('system', 'banner');
if (is_null($banner)) {
$banner = '
Friendica';
}
- Addon::callHooks('nav_info', $nav);
+ Hook::callAll('nav_info', $nav);
return [
'sitelocation' => $sitelocation,