There is now only one central parameter for the global directory.

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index df5e00394e07b61319227c2bdbc5a28d80565194..935d08f524536b6272951cf643842415f071e4b5 100644 (file)
--- 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,10 +118,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;
        }
@@ -200,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,