Diaspora: Incompatibilities with signature check solved

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index a90e850fe0be986461deab766c5e9c93fb020494..e6460c046b7a857d83f5c3eb1edf5a43b4d2b37b 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -85,7 +85,7 @@ function nav_info(&$a) {
                // user info
                $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
                $userinfo = array(
-                       'icon' => (count($r) ? $a->get_cached_avatar_image($r[0]['micro']) : $a->get_baseurl($ssl_state)."/images/person-48.jpg"),
+                       'icon' => (count($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg"),
                        'name' => $a->user['username'],
                );
 
@@ -110,7 +110,7 @@ function nav_info(&$a) {
        if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
                $nav['register'] = array('register',t('Register'), "", t('Create an account'));
 
-       $help_url = $a->get_baseurl($ssl_state) . '/help';
+       $help_url = 'help';
 
        if(! get_config('system','hide_help'))
                $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
@@ -118,15 +118,17 @@ function nav_info(&$a) {
        if(count($a->apps)>0)
                $nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
 
-       $nav['search'] = array('search', t('Search'), "", t('Search site content'));
+       if (local_user() OR !get_config('system','local_search')) {
+               $nav['search'] = array('search', t('Search'), "", t('Search site content'));
 
-       $nav['searchoption'] = array(
-                                       t("Full Text"),
-                                       t("Tags"),
-                                       t("Contacts"));
+               $nav['searchoption'] = array(
+                                               t("Full Text"),
+                                               t("Tags"),
+                                               t("Contacts"));
 
-       if (get_config('system','poco_local_search'))
-               $nav['searchoption'][] = t("Forums");
+               if (get_config('system','poco_local_search'))
+                       $nav['searchoption'][] = t("Forums");
+       }
 
        $gdirpath = 'directory';
 
@@ -140,7 +142,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'));
+       if(local_user())
+               $nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
 
        $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
 
@@ -167,7 +170,7 @@ function nav_info(&$a) {
                        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['notifications']['mark'] = array('', t('Mark as seen'), '',t('Mark all system notifications seen'));
                        }
                }