friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1660 from annando/issue-1657 

This fixes issue 1657
This commit is contained in:
Tobias Diekershoff 2015-06-11 06:30:50 +02:00
parent 8e800af306 df3b38679f
commit d2f4426fb5
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mod/directory.php
View File

@ -26,6 +26,7 @@ function directory_post(&$a) {
function directory_content(&$a) {
global $db;
require_once("mod/proxy.php");
@ -64,24 +65,38 @@ function directory_content(&$a) {
'$submit' => t('Find')
));
if($search)
if($search) {
$search = dbesc($search);
$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) " : "");
$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%'))";
}
$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 $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']);
$order = " ORDER BY `name` ASC ";
$order = " ORDER BY `name` ASC ";
$limit = intval($a->pager['start']).",".intval($a->pager['itemspage']);
$r = 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 %d , %d ",
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);
if(count($r)) {
if(in_array('small', $a->argv))