X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fdirectory.php;h=825e2a375f7e59509f54507e0e3c5e552b2350a3;hb=47f0abf27e2aa0f5443badd2a43617b922662bba;hp=e9bbf47ab7aaa7dc02a4fdae03fc62e17ca1afaf;hpb=b4b65521fe9546da760c19d8124c4cddd9406a88;p=friendica.git
diff --git a/mod/directory.php b/mod/directory.php
index e9bbf47ab7..825e2a375f 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,4 +1,5 @@
set_pager_itemspage(60);
}
@@ -14,11 +15,13 @@ function directory_post(&$a) {
function directory_content(&$a) {
$o = '';
$o .= '';
+ if(x($_SESSION,'theme'))
+ unset($_SESSION['theme']);
if(x($a->data,'search'))
$search = notags(trim($a->data['search']));
else
- $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+ $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
$tpl = load_view_file('view/directory_header.tpl');
@@ -37,16 +40,18 @@ function directory_content(&$a) {
if($search)
$search = dbesc($search);
- $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+ $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`pub_keywords`,`prv_keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+
+ $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
- $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra ");
+ $r = 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']);
- $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra ORDER BY `name` ASC LIMIT %d , %d ",
+ $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ORDER BY `name` ASC LIMIT %d , %d ",
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
@@ -63,6 +68,9 @@ function directory_content(&$a) {
$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+
+ $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '
' : '');
+
$details = '';
if(strlen($rr['locality']))
$details .= $rr['locality'];
@@ -83,18 +91,25 @@ function directory_content(&$a) {
if(strlen($rr['gender']))
$details .= '
Gender: ' . $rr['gender'];
- $o .= replace_macros($tpl,array(
+ $entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile-link' => $profile_link,
'$photo' => $rr[$photo],
'$alt-text' => $rr['name'],
'$name' => $rr['name'],
- '$details' => $details
+ '$details' => $pdesc . $details
));
+ $arr = array('contact' => $rr, 'entry' => $entry);
+
+ call_hooks('directory_item', $arr);
+
+ $o .= $entry;
+
}
+
$o .= "