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 df5e00394e07b61319227c2bdbc5a28d80565194..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,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.
         *
@@ -118,10 +117,18 @@ 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;
        }
@@ -130,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'));
@@ -197,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,
@@ -212,7 +223,7 @@ function nav_info(&$a) {
 
 /*
  * Set a menu item in navbar as selected
- * 
+ *
  */
 function nav_set_selected($item){
        $a = get_app();
@@ -228,6 +239,7 @@ function nav_set_selected($item){
                'settings'              => null,
                'contacts'              => null,
                'manage'        => null,
+               'events'        => null,
                'register'      => null,
        );
        $a->nav_sel[$item] = 'selected';