X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=7fa9754ef15f0e4a8e4b000c6a5ae0b4bfd1d442;hb=05b2836d660c043d00b204c05463e720bb72f62a;hp=7708f09e6b812d9dff9a158e601c0b821dea5987;hpb=070581f793ca43efaa44933e363012b35b812d0f;p=friendica.git
diff --git a/include/nav.php b/include/nav.php
index 7708f09e6b..7fa9754ef1 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,15 +118,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 +157,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 +210,8 @@ function nav_info(&$a) {
if($banner === false)
$banner .= 'Friendica';
+ call_hooks('nav_info', $nav);
+
return array(
'sitelocation' => $sitelocation,
@@ -225,6 +240,7 @@ function nav_set_selected($item){
'settings' => null,
'contacts' => null,
'manage' => null,
+ 'events' => null,
'register' => null,
);
$a->nav_sel[$item] = 'selected';