X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnav.php;h=e7f51cc0c055b08c56ded311e5a27a7a7a4766a9;hb=2e09ce6847b7474f1182ccfabfd40dfe1324837a;hp=7708f09e6b812d9dff9a158e601c0b821dea5987;hpb=7673579afc55813950d9e86237acd2a2f74e4ae2;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index 7708f09e6b..e7f51cc0c0 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -26,7 +26,7 @@ function nav(&$a) {
 	$tpl = get_markup_template('nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
-        '$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(),
 		'$langselector' => lang_selector(),
 		'$sitelocation' => $nav_info['sitelocation'],
 		'$nav' => $nav_info['nav'],
@@ -118,6 +118,14 @@ 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'))) {
@@ -125,8 +133,10 @@ function nav_info(&$a) {
 		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['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
 
@@ -145,15 +155,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'));
@@ -197,6 +208,8 @@ function nav_info(&$a) {
 	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,