Merge pull request #112 from tomtom84/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 0fea6f7..375c618
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -16,6 +16,8 @@ function acl_init(&$a){
        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)."%%')";
+       } else {
+               $sql_extra = $sql_extra2 = "";
        }
        
        // count groups and contacts
@@ -64,7 +66,7 @@ function acl_init(&$a){
 //             logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);                
                        $groups[] = array(
                                "type"  => "g",
-                               "photo" => "images/default-group-mm.png",
+                               "photo" => "images/twopeople.png",
                                "name"  => $g['name'],
                                "id"    => intval($g['id']),
                                "uids"  => array_map("intval", explode(",",$g['uids'])),
@@ -75,7 +77,7 @@ function acl_init(&$a){
        
        if ($type=='' || $type=='c'){
        
-               $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url` FROM `contact` 
+               $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` != ''
                        $sql_extra2
                        ORDER BY `name` ASC ",