Return old attr, not new

[gosa.git] / gosa-core / include / class_acl.inc

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index b2e3ca093d46de39d83c8a7f659c99466443fce1..ce577b39d0d2bc1f573b3dde8a24477d11333fb7 100644 (file)
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -89,8 +89,12 @@ class acl extends plugin
     while ($attrs= $ldap->fetch()){
 
       // Allow objects without cn to be listed without causing an error.
-      if(!isset($attrs['uid'][0])){
+      if(!isset($attrs['cn'][0]) && isset($attrs['uid'][0])){
+        $this->users['U:'.$attrs['dn']]=  $attrs['uid'][0];
+      }elseif(!isset($attrs['uid'][0]) && isset($attrs['cn'][0])){
         $this->users['U:'.$attrs['dn']]=  $attrs['cn'][0];
+      }elseif(!isset($attrs['uid'][0]) && !isset($attrs['cn'][0])){
+        $this->users['U:'.$attrs['dn']]= $attrs['dn'];
       }else{
         $this->users['U:'.$attrs['dn']]= $attrs['cn'][0].' ['.$attrs['uid'][0].']';
       }
@@ -1075,7 +1079,7 @@ class acl extends plugin
         $summary.= $cn.", ";
       }
     } else {
-      $summary.= _("ACL takes effect for all users");
+      $summary.= "<font color='red'><i>"._("inactive")."&nbsp;-&nbsp;"._("No members")."</i></font>";
     }
 
     return (preg_replace('/, $/', '', $summary));