Merge pull request #2896 from rabuzarus/0311_fix_photo_albums

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index 294a55585df14ed8eca9856edabd395ad1eefb31..06aeec622fffb5d0af21d163b12edeb8f6c6bae3 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -99,12 +99,11 @@ function directory_content(&$a) {
 
                foreach($r as $rr) {
 
-                       $community = '';
                        $itemurl= '';
 
                        $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 />' : '');
 
@@ -128,13 +127,6 @@ function directory_content(&$a) {
 //                     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 
-                       /// 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;
-
                        $profile = $rr;
 
                        if((x($profile,'address') == 1)
@@ -158,18 +150,20 @@ function directory_content(&$a) {
                        else {
                                $location_e = $location;
                        }
-                       
-                       $photo_menu = array(array(t("View Profile"), zrl($profile_link)));
+
+                       $photo_menu = array(
+                               'profile' => array(t("View Profile"), zrl($profile_link))
+                       );
 
                        $entry = array(
                                '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,
-                               'account_type' => ($community ? t('Forum') : ''),
+                               'account_type' => account_type($rr),
                                'profile' => $profile,
                                'location' => $location_e,
                                'tags' => $rr['pub_keywords'],
@@ -204,7 +198,7 @@ function directory_content(&$a) {
                        '$gdirpath' => $gdirpath,
                        '$desc' => t('Find on this site'),
                        '$contacts' => $entries,
-                       '$finding' => t('Finding:'),
+                       '$finding' => t('Results for:'),
                        '$findterm' => (strlen($search) ? $search : ""),
                        '$title' => t('Site Directory'),
                        '$submit' => t('Find'),