Merge pull request #36 from fabrixxm/master

[friendica.git] / mod / acl.php

diff --git a/mod/acl.php b/mod/acl.php
old mode 100644 (file)
new mode 100755 (executable)
index d87c8de..98ca90d
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -10,75 +10,90 @@ function acl_init(&$a){
        $start = (x($_POST,'start')?$_POST['start']:0);
        $count = (x($_POST,'count')?$_POST['count']:100);
        $search = (x($_POST,'search')?$_POST['search']:"");
+       $type = (x($_POST,'type')?$_POST['type']:"");
+       
 
        if ($search!=""){
                $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
-               $sql_extra2 = "AND (`name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
+               $sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
        }
        
        // count groups and contacts
-       $r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
-               intval(local_user())
-       );
-       $group_count = (int)$r[0]['g'];
-       $r = q("SELECT COUNT(`id`) AS c FROM `contact` 
-                       WHERE `uid` = %d AND `self` = 0 
-                         AND `blocked` = 0 AND `pending` = 0 
-                         AND `notify` != '' $sql_extra" ,
-               intval(local_user())
-       );
-       $contact_count = (int)$r[0]['c'];
+       if ($type=='' || $type=='g'){
+               $r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
+                       intval(local_user())
+               );
+               $group_count = (int)$r[0]['g'];
+       } else {
+               $group_count = 0;
+       }
+       
+       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 `notify` != '' $sql_extra" ,
+                       intval(local_user())
+               );
+               $contact_count = (int)$r[0]['c'];
+       } else {
+               $contact_count = 0;
+       }
        
        $tot = $group_count+$contact_count;
        
        $groups = array();
        $contacts = array();
        
-       $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') as uids
-                       FROM `group`,`group_member` 
-                       WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d 
-                               AND `group_member`.`gid`=`group`.`id`
-                               $sql_extra
-                       GROUP BY `group`.`id`
-                       ORDER BY `group`.`name` 
-                       LIMIT %d,%d",
-               intval(local_user()),
-               intval($start),
-               intval($count)
-       );
-
-       
-       foreach($r as $g){
-               $groups[] = array(
-                       "type"  => "g",
-                       "photo" => "images/default-group-mm.png",
-                       "name"  => $g['name'],
-                       "id"    => intval($g['id']),
-                       "uids"  => array_map("intval", explode(",",$g['uids'])),
-                       "link"  => ''
+       if ($type=='' || $type=='g'){
+               
+               $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') as uids
+                               FROM `group`,`group_member` 
+                               WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d 
+                                       AND `group_member`.`gid`=`group`.`id`
+                                       $sql_extra
+                               GROUP BY `group`.`id`
+                               ORDER BY `group`.`name` 
+                               LIMIT %d,%d",
+                       intval(local_user()),
+                       intval($start),
+                       intval($count)
                );
+
+               foreach($r as $g){
+//             logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);                
+                       $groups[] = array(
+                               "type"  => "g",
+                               "photo" => "images/twopeople.png",
+                               "name"  => $g['name'],
+                               "id"    => intval($g['id']),
+                               "uids"  => array_map("intval", explode(",",$g['uids'])),
+                               "link"  => ''
+                       );
+               }
        }
        
+       if ($type=='' || $type=='c'){
        
-       $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url` FROM `contact` 
-               WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
-               $sql_extra2
-               ORDER BY `name` ASC ",
-               intval(local_user())
-       );
-       foreach($r as $g){
-               $contacts[] = array(
-                       "type"  => "c",
-                       "photo" => $g['micro'],
-                       "name"  => $g['name'],
-                       "id"    => intval($g['id']),
-                       "network" => $g['network'],
-                       "link" => $g['url'],
-                       "nick" => $g['nick'],
+               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url` FROM `contact` 
+                       WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
+                       $sql_extra2
+                       ORDER BY `name` ASC ",
+                       intval(local_user())
                );
+               foreach($r as $g){
+                       $contacts[] = array(
+                               "type"  => "c",
+                               "photo" => $g['micro'],
+                               "name"  => $g['name'],
+                               "id"    => intval($g['id']),
+                               "network" => $g['network'],
+                               "link" => $g['url'],
+                               "nick" => ($g['attag']) ? $g['attag'] : $g['nick'],
+                       );
+               }
+                       
        }
-               
-       
        
        
        $items = array_merge($groups, $contacts);