Issue 2957: The avatar problem with mastodon should now finally be solved

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index 293fa99a57d6d511fe5796c74c689057802c5da2..fe4c50818ea583c3e02768b8b4ead0866fdb9422 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,6 +1,6 @@
 <?php
 
-function nav(&$a) {
+function nav(App $a) {
 
        /*
         *
@@ -28,7 +28,7 @@ function nav(&$a) {
        $tpl = get_markup_template('nav.tpl');
 
        $a->page['nav'] .= replace_macros($tpl, array(
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => App::get_baseurl(),
                '$sitelocation' => $nav_info['sitelocation'],
                '$nav' => $nav_info['nav'],
                '$banner' => $nav_info['banner'],
@@ -47,7 +47,11 @@ function nav(&$a) {
  * @brief Prepares a list of navigation links
  *
  * @param App $a
- * @return array
+ * @return array Navigation links
+ *     string 'sitelocation' => The webbie (username@site.com)
+ *     array 'nav' => Array of links used in the nav menu
+ *     string 'banner' => Formatted html link with banner image
+ *     array 'userinfo' => Array of user information (name, icon)
  */
 function nav_info(App $a)
 {
@@ -61,7 +65,7 @@ function nav_info(App $a)
 
        $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 );
+       $sitelocation = $myident . substr(App::get_baseurl($ssl_state), strpos(App::get_baseurl($ssl_state), '//') + 2 );
 
        // nav links: array of array('href', 'text', 'extra css classes', 'title')
        $nav = array();
@@ -84,14 +88,14 @@ function nav_info(App $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->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'),
+                       'icon' => (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'),
                        'name' => $a->user['username'],
                );
        } else {
                $nav['login'] = array('login', t('Login'), ($a->module == 'login' ? 'selected' : ''), t('Sign in'));
        }
 
-    // "Home" should also take you home from an authenticated remote profile connection
+       // "Home" should also take you home from an authenticated remote profile connection
        $homelink = get_my_url();
        if (! $homelink) {
                $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
@@ -188,6 +192,7 @@ function nav_info(App $a)
                $nav['contacts'] = array('contacts', t('Contacts'), '', t('Manage/edit friends and contacts'));
        }
 
+       // Show the link to the admin configuration page if user is admin
        if (is_site_admin()) {
                $nav['admin'] = array('admin/', t('Admin'), '', t('Site setup and configuration'));
        }
@@ -210,7 +215,6 @@ function nav_info(App $a)
        );
 }
 
-
 /**
  * Set a menu item in navbar as selected
  *