X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=411f0ac5da5c28d1341d9d3e43165b11385b01d3;hb=1726ededac6d50f7dabe5fdc482fb29632c7cda1;hp=bd933929d3b6b78ee7e8a3113558cd965e3d152d;hpb=479180ca8ea9fb02c8e90b0017d2f584aa199043;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index bd933929d3..411f0ac5da 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,6 +1,11 @@
 <?php
 
-function nav(App &$a) {
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
+function nav(App $a) {
 
 	/*
 	 *
@@ -8,7 +13,7 @@ function nav(App &$a) {
 	 *
 	 */
 
-	if(!(x($a->page,'nav')))
+	if (!(x($a->page,'nav')))
 		$a->page['nav'] = '';
 
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), array());
@@ -28,7 +33,7 @@ function nav(App &$a) {
 	$tpl = get_markup_template('nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
-		'$baseurl' => App::get_baseurl(),
+		'$baseurl' => System::baseUrl(),
 		'$sitelocation' => $nav_info['sitelocation'],
 		'$nav' => $nav_info['nav'],
 		'$banner' => $nav_info['banner'],
@@ -65,7 +70,7 @@ function nav_info(App $a)
 
 	$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
 
-	$sitelocation = $myident . substr(App::get_baseurl($ssl_state), strpos(App::get_baseurl($ssl_state), '//') + 2 );
+	$sitelocation = $myident . substr(System::baseUrl($ssl_state), strpos(System::baseUrl($ssl_state), '//') + 2 );
 
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
 	$nav = array();
@@ -86,9 +91,9 @@ function nav_info(App $a)
 		$nav['usermenu'][] = array('notes/', t('Personal notes'), '', t('Your personal notes'));
 
 		// user info
-		$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self` = 1", intval($a->user['uid']));
+		$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[0]['micro']) : 'images/person-48.jpg'),
+			'icon' => (DBM::is_result($r) ? $a->remove_baseurl($r['micro']) : 'images/person-48.jpg'),
 			'name' => $a->user['username'],
 		);
 	} else {
@@ -111,7 +116,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'));
 	}
 
@@ -119,7 +124,7 @@ function nav_info(App $a)
 		$nav['apps'] = array('apps', t('Apps'), '', t('Addon applications, utilities, games'));
 	}
 
-	if (local_user() OR !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(
@@ -127,21 +132,21 @@ 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($gdir)) {
+	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) {
+	} elseif (Config::get('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) {
+	} elseif (Config::get('system', 'community_page_style') == CP_GLOBAL_COMMUNITY) {
 		$nav['community'] = array('community', t('Community'), '', t('Conversations on the network'));
 	}
 
@@ -200,9 +205,9 @@ function nav_info(App $a)
 	$nav['navigation'] = array('navigation/', t('Navigation'), '', t('Site map'));
 
 	// Provide a banner/logo/whatever
-	$banner = get_config('system', 'banner');
+	$banner = Config::get('system', 'banner');
 	if ($banner === false) {
-		$banner = '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
+		$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>';
 	}
 
 	call_hooks('nav_info', $nav);