removal of useless variable

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index cb233db8983df5ae8f98b68354ed2d359d384bdd..50a0a93b9ce454e50ec8b604ce5e205e172527ff 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 " );
@@ -78,7 +78,7 @@ function directory_content(&$a) {
        $r = $db->q("SELECT COUNT(*) AS `total` FROM `profile`
                        LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
                        WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ");
-       if(count($r))
+       if (dbm::is_result($r))
                $a->set_pager_total($r[0]['total']);
 
        $order = " ORDER BY `name` ASC ";
@@ -90,21 +90,22 @@ function directory_content(&$a) {
                        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);
-       if(count($r)) {
+       if (dbm::is_result($r)) {
 
-               if(in_array('small', $a->argv))
+               if (in_array('small', $a->argv)) {
                        $photo = 'thumb';
-               else
+               }
+               else {
                        $photo = 'photo';
+               }
 
-               foreach($r as $rr) {
+               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 +129,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 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 +152,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 +200,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'),