diff options
author | RedMatrix <info@friendica.com> | 2015-01-08 09:38:45 +1100 |
---|---|---|
committer | RedMatrix <info@friendica.com> | 2015-01-08 09:38:45 +1100 |
commit | 8771dee9cf90b9c8f76c1856ea7e5107aab5840e (patch) | |
tree | 0ab8af1ffb5a92962b2918e274cae26046897d11 /mod | |
parent | a373b9f1d4d0ee6781927c3fcf05e0e301a80b6e (diff) | |
parent | 7176eb88452b3c74652de09e44de41943051391c (diff) | |
download | volse-hubzilla-8771dee9cf90b9c8f76c1856ea7e5107aab5840e.tar.gz volse-hubzilla-8771dee9cf90b9c8f76c1856ea7e5107aab5840e.tar.bz2 volse-hubzilla-8771dee9cf90b9c8f76c1856ea7e5107aab5840e.zip |
Merge pull request #829 from pafcu/oneautocompleter
Steps towards a single autocompleter
Diffstat (limited to 'mod')
-rw-r--r-- | mod/acl.php | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/mod/acl.php b/mod/acl.php index e6733351b..f575db55b 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -182,49 +182,29 @@ function acl_init(&$a){ ); } elseif($type == 'x') { - $r = navbar_complete($a); - $x = array(); - $x['query'] = $search; - $x['photos'] = array(); - $x['links'] = array(); - $x['suggestions'] = array(); - $x['data'] = array(); + $contacts = array(); if($r) { foreach($r as $g) { - $x['photos'][] = $g['photo']; - $x['links'][] = $g['url']; - $x['suggestions'][] = '@' . $g['name']; - $x['data'][] = $g['name']; + $contacts[] = array( + "photo" => $g['photo'], + "name" => $g['name'], + "nick" => $g['address'], + ); } } - echo json_encode($x); - killme(); + $o = array( + 'start' => $start, + 'count' => $count, + 'items' => $contacts, + ); + echo json_encode($o); + killme(); } else $r = array(); - - if($type == 'm' || $type == 'a' || $type == 'p') { - $x = array(); - $x['query'] = $search; - $x['photos'] = array(); - $x['links'] = array(); - $x['suggestions'] = array(); - $x['data'] = array(); - if(count($r)) { - foreach($r as $g) { - $x['photos'][] = $g['micro']; - $x['links'][] = $g['url']; - $x['suggestions'][] = $g['name']; - $x['data'][] = (($type === 'p') ? '@' . str_replace(' ','_',$g['name']) : $g['id']); - } - } - echo json_encode($x); - killme(); - } - if(count($r)) { foreach($r as $g){ @@ -284,7 +264,7 @@ function navbar_complete(&$a) { } $dirmode = intval(get_config('system','directory_mode')); - $search = ((x($_REQUEST,'query')) ? htmlentities($_REQUEST['query'],ENT_COMPAT,'UTF-8',false) : ''); + $search = ((x($_REQUEST,'search')) ? htmlentities($_REQUEST['search'],ENT_COMPAT,'UTF-8',false) : ''); if(! $search || mb_strlen($search) < 2) return array(); |