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

search_ac is really whacked - help it out a bit, but much more to do

Browse Source
This commit is contained in:
friendica 2013-10-01 19:04:08 -07:00
parent bacab7a3f0
commit 1f965f1b70
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mod/search_ac.php
View File

@ -30,22 +30,22 @@ function search_ac_init(&$a){
$people_sql_extra = protect_sprintf(" AND `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) . "%' ");
} }
// 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())
// );
$r = q("SELECT `id`, `name`, `micro`, `url` FROM `contact` // if($r) {
WHERE `uid` = %d AND `pending` = 0 // foreach($r as $g) {
$people_sql_extra // $x['photos'][] = $g['micro'];
ORDER BY `name` ASC ", // $x['links'][] = $g['url'];
intval(local_user()) // $x['suggestions'][] = '@' . $g['name'];
); // $x['data'][] = intval($g['id']);
// }
if(count($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 // FIXME - extend search to non-connnections if you couldn't find any connections with that name, use poco or directory
// else { // else {
// //
@ -64,7 +64,7 @@ function search_ac_init(&$a){
// } // }
// } // }
$r = q("select tid, term, url from term where type = %d $tag_sql_extra order by term asc", $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) intval(TERM_HASHTAG)
); );