From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 12 Feb 2010 13:26:55 +0000 (+0000)
Subject: Updated display for wildcard acls
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a81754b5f53452733c823005cdf541b6f8644b59;p=gosa.git

Updated display for wildcard acls


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15616 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index 80d5481cd..48c913c09 100644
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -117,6 +117,7 @@ class acl extends plugin
       }
       $this->groups['G:'.$attrs['dn']]= $attrs['cn'][0].' ['.$dsc.']';
     }
+    $this->groups['G:*']= _("All users");
     ksort($this->groups);
 
     /* Roles */
@@ -576,6 +577,9 @@ class acl extends plugin
 
       /* Generate list */
       $tmp= array();
+      if ($this->target == "group" && !isset($this->recipients["G:*"])){
+        $tmp["G:*"]= _("All users");
+      }
       foreach (array("user" => "users", "group" => "groups") as $field => $arr){
         if ($this->target == $field){
           foreach ($this->$arr as $key => $value){
@@ -980,8 +984,8 @@ class acl extends plugin
     $ldap= $config->get_ldap_link();
     foreach ($ma as $memberdn){
       // Check for wildcard here
-      if ($memberdn != "*") {
-        $dn= base64_decode($memberdn);
+      $dn= base64_decode($memberdn);
+      if ($dn != "*") {
         $ldap->cat($dn, array('cn', 'objectClass', 'description', 'uid'));
 
         /* Found entry... */
@@ -1002,7 +1006,7 @@ class acl extends plugin
         }
 
       } else {
-        $a['*']= sprintf(_("Wildcard ACL"));
+        $a['G:*']= sprintf(_("All users"));
       }
     }