X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=6512d35609f25e031674a1a673434b748211cb23;hb=45c2a4868efbf8f457914f87bee8553cc28fa77f;hp=e1661644d180beb92592d3f1dd0cb1e4825d6bac;hpb=3ff196f00dbad7e1efe6bb32cefbd7ece24127d4;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index e1661644d1..6512d35609 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -27,7 +27,6 @@ function nav(&$a) {
 
 	$a->page['nav'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(),
-		'$langselector' => lang_selector(),
 		'$sitelocation' => $nav_info['sitelocation'],
 		'$nav' => $nav_info['nav'],
 		'$banner' =>  $nav_info['banner'],
@@ -48,7 +47,7 @@ function nav_info(&$a) {
 
 	/**
 	 *
-	 * Our network is distributed, and as you visit friends some of the 
+	 * Our network is distributed, and as you visit friends some of the
 	 * sites look exactly the same - it isn't always easy to know where you are.
 	 * Display the current site location as a navigation aid.
 	 *
@@ -121,13 +120,15 @@ function nav_info(&$a) {
 	$nav['searchoption'] = array(
 					t("Full Text"),
 					t("Tags"),
-					t("Contacts"),
-					t("Forums"));
+					t("Contacts"));
+
+	if (get_config('system','poco_local_search'))
+		$nav['searchoption'][] = t("Forums");
 
 	$gdirpath = 'directory';
 
 	if(strlen(get_config('system','singleuser'))) {
-		$gdir = dirname(get_config('system','directory_submit_url'));
+		$gdir = get_config('system','directory');
 		if(strlen($gdir))
 			$gdirpath = $gdir;
 	}
@@ -136,6 +137,8 @@ function nav_info(&$a) {
 	elseif(get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
 		$nav['community'] = array('community', t('Community'), "", t('Conversations on the network'));
 
+	$nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
+
 	$nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
 
 	$nav['about'] = Array('friendica', t('Information'), "", t('Information about this friendica instance'));
@@ -203,7 +206,7 @@ function nav_info(&$a) {
 
 	$banner = get_config('system','banner');
 
-	if($banner === false) 
+	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>';
 
 	call_hooks('nav_info', $nav);
@@ -220,7 +223,7 @@ function nav_info(&$a) {
 
 /*
  * Set a menu item in navbar as selected
- * 
+ *
  */
 function nav_set_selected($item){
 	$a = get_app();
@@ -236,6 +239,7 @@ function nav_set_selected($item){
 		'settings'		=> null,
 		'contacts'		=> null,
 		'manage'        => null,
+		'events'        => null,
 		'register'      => null,
 	);
 	$a->nav_sel[$item] = 'selected';