diff options
Diffstat (limited to 'mod/search_ac.php')
| -rw-r--r-- | mod/search_ac.php | 51 |
1 files changed, 17 insertions, 34 deletions
diff --git a/mod/search_ac.php b/mod/search_ac.php index 8e87f8449..36da21376 100644 --- a/mod/search_ac.php +++ b/mod/search_ac.php @@ -27,42 +27,25 @@ function search_ac_init(&$a){ // Priority to people searches if ($search) { - $people_sql_extra = protect_sprintf(" AND `name` LIKE '%". dbesc($search) . "%' "); + $people_sql_extra = protect_sprintf(" AND `xchan_name` LIKE '%". dbesc($search) . "%' "); $tag_sql_extra = protect_sprintf(" AND term LIKE '%". dbesc($search) . "%' "); } -// FIXME - this is whacked -// $r = q("SELECT `id`, `name`, `micro`, `url` FROM `contact` -// WHERE `uid` = %d AND `pending` = 0 -// $people_sql_extra -// ORDER BY `name` ASC ", -// intval(local_user()) -// ); - -// if($r) { -// foreach($r as $g) { -// $x['photos'][] = $g['micro']; -// $x['links'][] = $g['url']; -// $x['suggestions'][] = '@' . $g['name']; -// $x['data'][] = intval($g['id']); -// } -// } -// FIXME - extend search to non-connnections if you couldn't find any connections with that name, use poco or directory -// else { -// -// $r = q("SELECT `id`, `name`, `photo`, `url` FROM `gcontact` where 1 -// $people_sql_extra -// ORDER BY `name` ASC " -// ); - -// if(count($r)) { -// foreach($r as $g) { -// $x['photos'][] = $g['photo']; -// $x['links'][] = $g['url']; -// $x['suggestions'][] = '@' . $g['name']; -// $x['data'][] = intval($g['id']); -// } -// } -// } + + + $r = q("SELECT `abook_id`, `xchan_name`, `xchan_photo_s`, `xchan_url` FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d + $people_sql_extra + ORDER BY `xchan_name` ASC ", + intval(local_user()) + ); + + if($r) { + foreach($r as $g) { + $x['photos'][] = $g['xchan_photo_s']; + $x['links'][] = $g['xchan_url']; + $x['suggestions'][] = '@' . $g['xchan_name']; + $x['data'][] = 'cid=' . intval($g['abook_id']); + } + } $r = q("select distinct term, tid, url from term where type = %d $tag_sql_extra group by term order by term asc", intval(TERM_HASHTAG) |