Issue 2122: Make sure to always return the correct number of entries

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index 108dbbf1323fc5af2fb5263e1978456318aff0d5..6512d35609f25e031674a1a673434b748211cb23 100644 (file)
--- 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 );
 
 
@@ -76,8 +75,9 @@ function nav_info(&$a) {
                $nav['usermenu'][] = Array('profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations'));
                $nav['usermenu'][] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
                $nav['usermenu'][] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+               $nav['usermenu'][] = Array('videos/' . $a->user['nickname'], t('Videos'), "", t('Your videos'));
                $nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events'));
-               $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+               $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']));
@@ -85,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'));
@@ -100,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'));
 
 
@@ -117,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'));
 
@@ -144,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_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'));
@@ -167,6 +180,7 @@ function nav_info(&$a) {
                $nav['delegations'] = Array('delegate', t('Delegations'), "", t('Delegate Page Management'));
 
                $nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
+
                if(feature_enabled(local_user(),'multi_profiles'))
                        $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/Edit Profiles'));
 
@@ -192,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,
@@ -207,7 +223,7 @@ function nav_info(&$a) {
 
 /*
  * Set a menu item in navbar as selected
- * 
+ *
  */
 function nav_set_selected($item){
        $a = get_app();
@@ -223,6 +239,7 @@ function nav_set_selected($item){
                'settings'              => null,
                'contacts'              => null,
                'manage'        => null,
+               'events'        => null,
                'register'      => null,
        );
        $a->nav_sel[$item] = 'selected';