harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

the rest of the fix

Browse Source
This commit is contained in:
friendica 2013-09-02 20:53:52 -07:00
parent c646388cd9
commit 9d262a186f
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mod/search_ac.php
View File

@ -27,19 +27,18 @@ function search_ac_init(&$a){
// Priority to people searches // Priority to people searches
if ($search) { if ($search) {
$people_sql_extra = protect_sprintf(" AND `xchan_name` LIKE '%". dbesc($search) . "%' "); $people_sql_extra = protect_sprintf(" AND `name` LIKE '%". dbesc($search) . "%' ");
$tag_sql_extra = protect_sprintf(" AND term LIKE '%". dbesc($search) . "%' "); $tag_sql_extra = protect_sprintf(" AND term LIKE '%". dbesc($search) . "%' ");
} }
$r = q("SELECT `id`, `name`, `micro`, `url` FROM `contact`
$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms WHERE `uid` = %d AND `pending` = 0
FROM abook left join xchan on abook_xchan = xchan_hash $people_sql_extra
WHERE abook_channel = %d AND not ( abook_flags & %d ) $people_sql_extra order by xchan_name asc" , ORDER BY `name` ASC ",
intval(local_user()), intval(local_user())
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED)
); );
if($r) { if(count($r)) {
foreach($r as $g) { foreach($r as $g) {
$x['photos'][] = $g['micro']; $x['photos'][] = $g['micro'];
$x['links'][] = $g['url']; $x['links'][] = $g['url'];
@ -47,22 +46,23 @@ function search_ac_init(&$a){
$x['data'][] = intval($g['id']); $x['data'][] = intval($g['id']);
} }
} }
else { // 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 "
// );
$r = q("SELECT `id`, `name`, `photo`, `url` FROM `gcontact` where 1 // if(count($r)) {
$people_sql_extra // foreach($r as $g) {
ORDER BY `name` ASC " // $x['photos'][] = $g['photo'];
); // $x['links'][] = $g['url'];
// $x['suggestions'][] = '@' . $g['name'];
if(count($r)) { // $x['data'][] = intval($g['id']);
foreach($r as $g) { // }
$x['photos'][] = $g['photo']; // }
$x['links'][] = $g['url']; // }
$x['suggestions'][] = '@' . $g['name'];
$x['data'][] = intval($g['id']);
}
}
}
$r = q("select tid, term, url from term where type = %d $tag_sql_extra order by term asc", $r = q("select tid, term, url from term where type = %d $tag_sql_extra order by term asc",
intval(TERM_HASHTAG) intval(TERM_HASHTAG)