give themes more control over events/birthdays and provide them as notifications

[friendica.git] / mod / acl.php

diff --git a/mod/acl.php b/mod/acl.php
index c23ee1a67bc4e34e4c1d6c2524c75618fe41b8db..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){
@@ -13,6 +14,15 @@ function acl_init(&$a){
        $type = (x($_REQUEST,'type')?$_REQUEST['type']:"");
        
 
+       // For use with jquery.autocomplete for private mail completion
+
+       if(x($_REQUEST,'query') && strlen($_REQUEST['query'])) {
+               if(! $type)
+                       $type = 'm';
+               $search = $_REQUEST['query'];
+       }
+
+
        if ($search!=""){
                $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
                $sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
@@ -33,7 +43,7 @@ function acl_init(&$a){
        if ($type=='' || $type=='c'){
                $r = q("SELECT COUNT(`id`) AS c FROM `contact` 
                                WHERE `uid` = %d AND `self` = 0 
-                               AND `blocked` = 0 AND `pending` = 0 
+                               AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
                                AND `notify` != '' $sql_extra2" ,
                        intval(local_user())
                );
@@ -45,7 +55,7 @@ function acl_init(&$a){
 
                $r = q("SELECT COUNT(`id`) AS c FROM `contact` 
                                WHERE `uid` = %d AND `self` = 0 
-                               AND `blocked` = 0 AND `pending` = 0 
+                               AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 
                                AND `network` IN ('%s','%s','%s') $sql_extra2" ,
                        intval(local_user()),
                        dbesc(NETWORK_DFRN),
@@ -54,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;
        }
@@ -94,7 +116,7 @@ function acl_init(&$a){
        if ($type=='' || $type=='c'){
        
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
-                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
+                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
                        $sql_extra2
                        ORDER BY `name` ASC ",
                        intval(local_user())
@@ -102,7 +124,7 @@ function acl_init(&$a){
        }
        elseif($type == 'm') {
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
-                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 
+                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
                        AND `network` IN ('%s','%s','%s')
                        $sql_extra2
                        ORDER BY `name` ASC ",
@@ -112,9 +134,37 @@ 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' || $type == 'a') {
+               $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'][] = intval($g['id']);
+                       }
+               }
+               echo json_encode($x);
+               killme();
+       }
+
        if(count($r)) {
                foreach($r as $g){
                        $contacts[] = array(