MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

sort out contact search oddities

Browse source
This commit is contained in:
friendica 2012-06-20 16:20:55 -07:00
parent 03c05d8a28
commit f4e434cd46
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mod/contacts.php
View file

@ -482,10 +482,10 @@ function contacts_content(&$a) {
$searching = false; $searching = false;
if($search) { if($search) {
$search_hdr = $search; $search_hdr = $search;
$search = dbesc(protect_sprintf('%' . $search . '%')); $search_txt = dbesc(protect_sprintf(preg_quote($search)));
$searching = true; $searching = true;
} }
$sql_extra .= (($searching) ? " AND `name` REGEXP '$search' " : ""); $sql_extra .= (($searching) ? " AND `name` REGEXP '$search_txt' " : "");
if($nets) if($nets)
$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets)); $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
@ -502,7 +502,6 @@ function contacts_content(&$a) {
} }
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
intval($_SESSION['uid']), intval($_SESSION['uid']),
intval($a->pager['start']), intval($a->pager['start']),
@ -569,7 +568,7 @@ function contacts_content(&$a) {
'$total' => $total, '$total' => $total,
'$search' => $search_hdr, '$search' => $search_hdr,
'$desc' => t('Search your contacts'), '$desc' => t('Search your contacts'),
'$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""), '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
'$submit' => t('Find'), '$submit' => t('Find'),
'$cmd' => $a->cmd, '$cmd' => $a->cmd,
'$contacts' => $contacts, '$contacts' => $contacts,