Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index 7ce1530efc5aa36e879d565346f4428f7c87f634..625f6c95aca781eee24e1a3f895361f8c455e1b6 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,5 +1,5 @@
 <?php
-if(! function_exists('directory_init')) {
+
 function directory_init(&$a) {
        $a->set_pager_itemspage(60);
 
@@ -16,23 +16,23 @@ function directory_init(&$a) {
                unset($_SESSION['mobile-theme']);
        }
 
+
 }
-}
 
-if(! function_exists('directory_post')) {
+
 function directory_post(&$a) {
        if(x($_POST,'search'))
                $a->data['search'] = $_POST['search'];
 }
-}
 
-if(! function_exists('directory_content')) {
+
+
 function directory_content(&$a) {
        global $db;
 
        require_once("mod/proxy.php");
 
-       if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || 
                (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                return;
@@ -104,7 +104,7 @@ function directory_content(&$a) {
 
                        $itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
 
-                       $profile_link = z_root() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+                       $profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 
                        $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
@@ -123,14 +123,14 @@ function directory_content(&$a) {
                        }
 //                     if(strlen($rr['dob'])) {
 //                             if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-//                                     $details .= '<br />' . t('Age: ') . $years ;
+//                                     $details .= '<br />' . t('Age: ') . $years ; 
 //                     }
 //                     if(strlen($rr['gender']))
 //                             $details .= '<br />' . t('Gender: ') . $rr['gender'];
 
 
                        // show if account is a community account
-                       /// @TODO The other page types should be also respected, but first we need a good
+                       /// @TODO The other page types should be also respected, but first we need a good 
                        /// translatiion and systemwide consistency for displaying the page type
                        if((intval($rr['page-flags']) == PAGE_COMMUNITY) OR (intval($rr['page-flags']) == PAGE_PRVGROUP))
                                $community = true;
@@ -165,7 +165,7 @@ function directory_content(&$a) {
                                'id' => $rr['id'],
                                'url' => $profile_link,
                                'itemurl' => $itemurl,
-                               'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB),
+                               'thumb' => proxy_url($rr[$photo], false, PROXY_SIZE_THUMB),
                                'img_hover' => $rr['name'],
                                'name' => $rr['name'],
                                'details' => $details,
@@ -217,4 +217,3 @@ function directory_content(&$a) {
 
        return $o;
 }
-}