X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=1bc9a3ae1d34ce602154c6d30e2a141e0c173577;hb=05674206ba9a7c70c5e298e3925d95428abff78e;hp=d7a6e397c603162efdee4e551cc9725d0a777ead;hpb=62aa839876fa3f743db641e46e0026bab0abe622;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index d7a6e397c6..1bc9a3ae1d 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,7 +1,12 @@
 <?php
-
+/**
+ * @file include/nav.php
+ */
 use Friendica\App;
+use Friendica\Content\Feature;
+use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function nav(App $a) {
 
@@ -91,7 +96,7 @@ function nav_info(App $a)
 		// user info
 		$r = dba::select('contact', array('micro'), array('uid' => $a->user['uid'], 'self' => true), array('limit' => 1));
 		$userinfo = array(
-			'icon' => (dbm::is_result($r) ? $a->remove_baseurl($r['micro']) : 'images/person-48.jpg'),
+			'icon' => (DBM::is_result($r) ? $a->remove_baseurl($r['micro']) : 'images/person-48.jpg'),
 			'name' => $a->user['username'],
 		);
 	} else {
@@ -114,7 +119,7 @@ function nav_info(App $a)
 
 	$help_url = 'help';
 
-	if (! get_config('system', 'hide_help')) {
+	if (!Config::get('system', 'hide_help')) {
 		$nav['help'] = array($help_url, t('Help'), '', t('Help and documentation'));
 	}
 
@@ -122,7 +127,7 @@ function nav_info(App $a)
 		$nav['apps'] = array('apps', t('Apps'), '', t('Addon applications, utilities, games'));
 	}
 
-	if (local_user() || !get_config('system', 'local_search')) {
+	if (local_user() || !Config::get('system', 'local_search')) {
 		$nav['search'] = array('search', t('Search'), '', t('Search site content'));
 
 		$nav['searchoption'] = array(
@@ -130,22 +135,22 @@ function nav_info(App $a)
 						t('Tags'),
 						t('Contacts'));
 
-		if (get_config('system', 'poco_local_search')) {
+		if (Config::get('system', 'poco_local_search')) {
 			$nav['searchoption'][] = t('Forums');
 		}
 	}
 
 	$gdirpath = 'directory';
 
-	if (strlen(get_config('system', 'singleuser'))) {
-		$gdir = get_config('system', 'directory');
+	if (strlen(Config::get('system', 'singleuser'))) {
+		$gdir = Config::get('system', 'directory');
 		if (strlen($gdir)) {
 			$gdirpath = zrl($gdir, true);
 		}
-	} elseif (get_config('system', 'community_page_style') == CP_USERS_ON_SERVER) {
-		$nav['community'] = array('community', t('Community'), '', t('Conversations on this site'));
-	} elseif (get_config('system', 'community_page_style') == CP_GLOBAL_COMMUNITY) {
-		$nav['community'] = array('community', t('Community'), '', t('Conversations on the network'));
+	}
+
+	if (local_user() || Config::get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) {
+		$nav['community'] = array('community', t('Community'), '', t('Conversations on this and other servers'));
 	}
 
 	if (local_user()) {
@@ -188,7 +193,7 @@ function nav_info(App $a)
 
 		$nav['settings'] = array('settings', t('Settings'), '', t('Account settings'));
 
-		if (feature_enabled(local_user(), 'multi_profiles')) {
+		if (Feature::isEnabled(local_user(), 'multi_profiles')) {
 			$nav['profiles'] = array('profiles', t('Profiles'), '', t('Manage/Edit Profiles'));
 		}
 
@@ -203,8 +208,8 @@ function nav_info(App $a)
 	$nav['navigation'] = array('navigation/', t('Navigation'), '', t('Site map'));
 
 	// Provide a banner/logo/whatever
-	$banner = get_config('system', 'banner');
-	if ($banner === false) {
+	$banner = 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>';
 	}
 
@@ -225,6 +230,7 @@ function nav_info(App $a)
 function nav_set_selected($item){
 	$a = get_app();
 	$a->nav_sel = array(
+		'global' 	=> null,
 		'community' 	=> null,
 		'network' 	=> null,
 		'home'		=> null,