X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=6512d35609f25e031674a1a673434b748211cb23;hb=a867e3a7524e067bdf5da515d85fa2581a6fe49c;hp=f838830a8873b109537acec32edc15de36907c96;hpb=ed1dce93d688cc6917348cac955e2b3a159215b9;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index f838830a88..6512d35609 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -26,8 +26,7 @@ function nav(&$a) {
 	$tpl = get_markup_template('nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
-        '$baseurl' => $a->get_baseurl(),
-		'$langselector' => lang_selector(),
+		'$baseurl' => $a->get_baseurl(),
 		'$sitelocation' => $nav_info['sitelocation'],
 		'$nav' => $nav_info['nav'],
 		'$banner' =>  $nav_info['banner'],
@@ -48,14 +47,14 @@ 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.
 	 *
 	 */
 
 	$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
-		
+
 	$sitelocation = $myident . substr($a->get_baseurl($ssl_state),strpos($a->get_baseurl($ssl_state),'//') + 2 );
 
 
@@ -86,7 +85,7 @@ function nav_info(&$a) {
 			'icon' => (count($r) ? $a->get_cached_avatar_image($r[0]['micro']) : $a->get_baseurl($ssl_state)."/images/person-48.jpg"),
 			'name' => $a->user['username'],
 		);
-		
+
 	}
 	else {
 		$nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'selected':''), t('Sign in'));
@@ -101,7 +100,7 @@ function nav_info(&$a) {
 	if(! $homelink)
 		$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
 
-	if(($a->module != 'home') && (! (local_user()))) 
+	if(($a->module != 'home') && (! (local_user())))
 		$nav['home'] = array($homelink, t('Home'), "", t('Home Page'));
 
 
@@ -118,15 +117,27 @@ function nav_info(&$a) {
 
 	$nav['search'] = array('search', t('Search'), "", t('Search site content'));
 
+	$nav['searchoption'] = array(
+					t("Full Text"),
+					t("Tags"),
+					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;
 	}
-	elseif(! get_config('system','no_community_page'))
+	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'));
+
+	$nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
 
 	$nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
 
@@ -145,15 +156,16 @@ function nav_info(&$a) {
 
 		$nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
 
+		if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_PRVGROUP))) {
+			/* only show friend requests for normal pages. Other page types have automatic friendship. */
+			if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_PRVGROUP)))
+				$nav['introductions'] = array('notifications/intros',	t('Introductions'), "", t('Friend Requests'));
 
-		/* only show friend requests for normal pages. Other page types have automatic friendship. */
-
-		if($_SESSION['page_flags'] == PAGE_NORMAL || $_SESSION['page_flags'] == PAGE_SOAPBOX || $_SESSION['page_flags'] == PAGE_PRVGROUP) {
-			$nav['introductions'] = array('notifications/intros',	t('Introductions'), "", t('Friend Requests'));
-			$nav['notifications'] = array('notifications',	t('Notifications'), "", t('Notifications'));
-			$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
-			$nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '','');
-
+			if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) {
+				$nav['notifications'] = array('notifications',	t('Notifications'), "", t('Notifications'));
+				$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
+				$nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '','');
+			}
 		}
 
 		$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
@@ -194,9 +206,11 @@ 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);
+
 
 	return array(
 		'sitelocation' => $sitelocation,
@@ -209,7 +223,7 @@ function nav_info(&$a) {
 
 /*
  * Set a menu item in navbar as selected
- * 
+ *
  */
 function nav_set_selected($item){
 	$a = get_app();
@@ -225,6 +239,7 @@ function nav_set_selected($item){
 		'settings'		=> null,
 		'contacts'		=> null,
 		'manage'        => null,
+		'events'        => null,
 		'register'      => null,
 	);
 	$a->nav_sel[$item] = 'selected';