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 bedc71907eadfbdbf3f14f02e7bc125ce3d9a19b..625f6c95aca781eee24e1a3f895361f8c455e1b6 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -57,19 +57,19 @@ function directory_content(&$a) {
 
                $sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
                                (`user`.`nickname` LIKE '%$search%') OR
-                               (`pdesc` LIKE '%$search%') OR
-                               (`locality` LIKE '%$search%') OR
-                               (`region` LIKE '%$search%') OR
-                               (`country-name` LIKE '%$search%') OR
-                               (`gender` LIKE '%$search%') OR
-                               (`marital` LIKE '%$search%') OR
-                               (`sexual` LIKE '%$search%') OR
-                               (`about` LIKE '%$search%') OR
-                               (`romance` LIKE '%$search%') OR
-                               (`work` LIKE '%$search%') OR
-                               (`education` LIKE '%$search%') OR
-                               (`pub_keywords` LIKE '%$search%') OR
-                               (`prv_keywords` LIKE '%$search%'))";
+                               (`profile`.`pdesc` LIKE '%$search%') OR
+                               (`profile`.`locality` LIKE '%$search%') OR
+                               (`profile`.`region` LIKE '%$search%') OR
+                               (`profile`.`country-name` LIKE '%$search%') OR
+                               (`profile`.`gender` LIKE '%$search%') OR
+                               (`profile`.`marital` LIKE '%$search%') OR
+                               (`profile`.`sexual` LIKE '%$search%') OR
+                               (`profile`.`about` LIKE '%$search%') OR
+                               (`profile`.`romance` LIKE '%$search%') OR
+                               (`profile`.`work` LIKE '%$search%') OR
+                               (`profile`.`education` LIKE '%$search%') OR
+                               (`profile`.`pub_keywords` LIKE '%$search%') OR
+                               (`profile`.`prv_keywords` LIKE '%$search%'))";
        }
 
        $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
@@ -86,7 +86,7 @@ function directory_content(&$a) {
        $limit = intval($a->pager['start']).",".intval($a->pager['itemspage']);
 
        $r = $db->q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
-                       `contact`.`addr` AS faddr, `contact`.`url` AS profile_url FROM `profile`
+                       `contact`.`addr`, `contact`.`url` AS profile_url FROM `profile`
                        LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
                        LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
                        WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
@@ -102,9 +102,9 @@ function directory_content(&$a) {
                        $community = '';
                        $itemurl= '';
 
-                       $itemurl = (($rr['faddr'] != "") ? $rr['faddr'] : $rr['profile_url']);
+                       $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 />' : '');
 
@@ -130,8 +130,8 @@ function directory_content(&$a) {
 
 
                        // show if account is a community account
-                       // ToDo the other should be also respected, but first we need a good translatiion
-                       // and systemwide consistency for displaying the page type
+                       /// @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;
 
@@ -158,14 +158,14 @@ function directory_content(&$a) {
                        else {
                                $location_e = $location;
                        }
-                       
+
                        $photo_menu = array(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,