X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=a6a9cb8ab24356f4ef017c7ed3e01b9e0414e75c;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=ef80b082a42bb989dc73365cc10a48478a1926ec;hpb=40790844920f8afe6b9c3bd33536091633c26bf9;p=friendica.git
diff --git a/mod/directory.php b/mod/directory.php
index ef80b082a4..a6a9cb8ab2 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -57,25 +57,27 @@ 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 " );
- $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 ");
+ $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))
$a->set_pager_total($r[0]['total']);
@@ -83,7 +85,11 @@ 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` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT ".$limit);
+ $r = $db->q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
+ `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);
if(count($r)) {
if(in_array('small', $a->argv))
@@ -93,8 +99,12 @@ function directory_content(&$a) {
foreach($r as $rr) {
+ $community = '';
+ $itemurl= '';
- $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+ $itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
+
+ $profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '
' : '');
@@ -111,23 +121,19 @@ function directory_content(&$a) {
$details .= ', ';
$details .= $rr['country-name'];
}
- if(strlen($rr['dob'])) {
- if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
- $details .= '
' . t('Age: ') . $years ;
- }
- if(strlen($rr['gender']))
- $details .= '
' . t('Gender: ') . $rr['gender'];
-
- if($rr['page-flags'] == PAGE_NORMAL)
- $page_type = "Personal Profile";
- if($rr['page-flags'] == PAGE_SOAPBOX)
- $page_type = "Fan Page";
- if($rr['page-flags'] == PAGE_COMMUNITY)
- $page_type = "Community Forum";
- if($rr['page-flags'] == PAGE_FREELOVE)
- $page_type = "Open Forum";
- if($rr['page-flags'] == PAGE_PRVGROUP)
- $page_type = "Private Group";
+// if(strlen($rr['dob'])) {
+// if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
+// $details .= '
' . t('Age: ') . $years ;
+// }
+// if(strlen($rr['gender']))
+// $details .= '
' . 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;
@@ -153,21 +159,28 @@ function directory_content(&$a) {
$location_e = $location;
}
+ $photo_menu = array(
+ 'profile' => array(t("View Profile"), zrl($profile_link))
+ );
+
$entry = array(
'id' => $rr['id'],
'url' => $profile_link,
- 'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB),
+ 'itemurl' => $itemurl,
+ 'thumb' => proxy_url($rr[$photo], false, PROXY_SIZE_THUMB),
'img_hover' => $rr['name'],
'name' => $rr['name'],
- 'details' => $pdesc . $details,
- 'page_type' => $page_type,
+ 'details' => $details,
+ 'account_type' => ($community ? t('Forum') : ''),
'profile' => $profile,
'location' => $location_e,
+ 'tags' => $rr['pub_keywords'],
'gender' => $gender,
'pdesc' => $pdesc,
'marital' => $marital,
'homepage' => $homepage,
'about' => $about,
+ 'photo_menu' => $photo_menu,
);
@@ -193,7 +206,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'),