Friendicaland

[friendica.git] / mod / acl.php

diff --git a/mod/acl.php b/mod/acl.php
index 168b1f59f0a636978b32e4c45a532f895ef244f0..f3e46efa5610bc952a57aa240b86c384f73dd34d 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -1,5 +1,6 @@
 <?php
 /* ACL selector json backend */
+
 require_once("include/acl_selectors.php");
 
 function acl_init(&$a){
@@ -16,7 +17,8 @@ function acl_init(&$a){
        // For use with jquery.autocomplete for private mail completion
 
        if(x($_REQUEST,'query') && strlen($_REQUEST['query'])) {
-               $type = 'm';
+               if(! $type)
+                       $type = 'm';
                $search = $_REQUEST['query'];
        }
 
@@ -62,6 +64,18 @@ function acl_init(&$a){
                );
                $contact_count = (int)$r[0]['c'];
 
+       }
+       elseif ($type == 'a') {
+
+               // autocomplete for Contacts
+
+               $r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+                               WHERE `uid` = %d AND `self` = 0 
+                               AND `pending` = 0 $sql_extra2" ,
+                       intval(local_user())
+               );
+               $contact_count = (int)$r[0]['c'];
+
        } else {
                $contact_count = 0;
        }
@@ -120,11 +134,19 @@ function acl_init(&$a){
                        dbesc(NETWORK_DIASPORA)
                );
        }
+       elseif($type == 'a') {
+               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
+                       WHERE `uid` = %d AND `pending` = 0
+                       $sql_extra2
+                       ORDER BY `name` ASC ",
+                       intval(local_user())
+               );
+       }
        else
                $r = array();
 
 
-       if($type == 'm') {
+       if($type == 'm' || $type == 'a') {
                $x = array();
                $x['query'] = $search;
                $x['photos'] = array();
@@ -135,7 +157,7 @@ function acl_init(&$a){
                        foreach($r as $g) {
                                $x['photos'][] = $g['micro'];
                                $x['links'][] = $g['url'];
-                               $x['suggestions'][] = $g['name']; // sprintf( t('%s [%s]'),$g['name'],$g['url']);
+                               $x['suggestions'][] = $g['name'];
                                $x['data'][] = intval($g['id']);
                        }
                }