X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_acl.inc;h=853893edcd486e35178ebc96cee973e92e7d3f23;hb=b9fc1972cf2270252fc2a9940feab21c93372e94;hp=455a55ea2d431d878a02c8093fbbc28005ea7566;hpb=3143b4fd380294097dfba0bc1a3f3f51cca27715;p=gosa.git

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index 455a55ea2..853893edc 100644
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -571,7 +571,7 @@ class acl extends plugin
                     $summary= '<i>'._("No ACL settings for this category!").'</i>';
                 } else {
                     $summary= trim($summary,", ");
-                    $summary= " ".sprintf(_("Contains ACLs for these objects: %s"), $summary);
+                    $summary= " ".sprintf(_("ACLs for: %s"), $summary);
                 }
 
                 $actions ="";
@@ -628,13 +628,12 @@ class acl extends plugin
 
       /* Role selector if scope is base */
       if ($this->aclType == 'role'){
-        $smarty->assign('roleSelector', "Role selector");#, $this->buildRoleSelector($this->myAclObjects));
         $smarty->assign('roleSelector', $this->buildRoleSelector($this->roles));
       }
     }
 
     if ($this->dialogState == 'edit'){
-      $smarty->assign('headline', sprintf(_("Edit ACL for '%s' - scope is '%s'"), $this->aclObjects[$this->aclObject], $this->aclTypes[$this->aclType]));
+      $smarty->assign('headline', sprintf(_("Edit ACL for '%s' with scope '%s'"), $this->aclObjects[$this->aclObject], $this->aclTypes[$this->aclType]));
 
       /* Collect objects for selected category */
       foreach ($this->ocMapping[$this->aclObject] as $idx => $class){
@@ -1087,9 +1086,9 @@ class acl extends plugin
       if($entry['type'] == "role"){
 
         if(isset($this->roles[$entry['acl']])){  
-          $summary.= sprintf(_("Role: %s"), $this->roles[$entry['acl']]['cn']);
+          $summary.= sprintf(_("ACL role: %s"), $this->roles[$entry['acl']]['cn']);
         }else{
-          $summary.= sprintf(_("Role: %s"), "<i>"._("unknown role")."</i>");
+          $summary.= sprintf(_("ACL role: %s"), "<i>"._("unknown ACL role")."</i>");
         }
       }else{
         foreach ($entry['acl'] as $name => $object){
@@ -1185,6 +1184,7 @@ class acl extends plugin
       /* ACL's if needed */
       $final.= ":";
       if ($entry['type'] != "reset" && $entry['type'] != "role"){
+        $acl = "";
         if (isset($entry['acl'])){
           foreach ($entry['acl'] as $object => $contents){
 
@@ -1293,7 +1293,6 @@ class acl extends plugin
                                                           "objectClass"  => array("gosaAcl","gosaRole"))),
           "plProvidedAcls"=> array(
            "gosaAclEntry"          => _("ACL Entries")
-//            "description" => _("Role description")
             )
 
           ));