X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_acl.inc;h=0c3448e09f2a086c79025df542b1aa1eceec9de3;hb=9c309d6fc3d3ff65caf535b6f53ea3177433d29b;hp=71db1500bee255d914cdc83afdcac117706c565d;hpb=1168b8f988889b763bbe317f36c5c296115f433b;p=gosa.git

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index 71db1500b..0c3448e09 100644
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -520,7 +520,7 @@ class acl extends plugin
 
     /* Create templating instance */
     $smarty= get_smarty();
-    $smarty->assign("usePrototype", "true");
+
     $smarty->assign("acl_readable",$this->acl_is_readable(""));
     if(!$this->acl_is_readable("")){
       return ($smarty->fetch (get_template_path('acl.tpl')));
@@ -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){
@@ -947,9 +946,13 @@ class acl extends plugin
     if(count($list) == 5){
       list($index, $type,$member,$permission,$filter)= $list;
       $filter = base64_decode($filter);
-    }else{
+    }elseif(count($list) == 4){
       $filter = "";
       list($index, $type,$member,$permission)= $list;
+    }else{
+      $permission = "";
+      $filter = "";
+      list($index, $type,$member)= $list;
     }
 
     $a= array( $index => array("type" => $type,
@@ -1083,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){
@@ -1129,7 +1132,7 @@ class acl extends plugin
       $acl= $this->gosaAclEntry[$this->currentIndex];
       $this->aclType= $acl['type'];
       $this->recipients= $acl['members'];
-      $this->aclContents= $acl['acl'];
+      $this->aclContents= (isset($acl['acl'])) ? $acl['acl'] :"";
       $this->aclFilter= $acl['filter'];
     }
 
@@ -1179,8 +1182,9 @@ class acl extends plugin
       }
 
       /* ACL's if needed */
+      $final.= ":";
       if ($entry['type'] != "reset" && $entry['type'] != "role"){
-        $acl= ":";
+        $acl = "";
         if (isset($entry['acl'])){
           foreach ($entry['acl'] as $object => $contents){
 
@@ -1213,7 +1217,7 @@ class acl extends plugin
       }
 
       $tmp_acl[]= $final;
-    } 
+    }
 
     /* Call main method */
     plugin::save();
@@ -1289,7 +1293,6 @@ class acl extends plugin
                                                           "objectClass"  => array("gosaAcl","gosaRole"))),
           "plProvidedAcls"=> array(
            "gosaAclEntry"          => _("ACL Entries")
-//            "description" => _("Role description")
             )
 
           ));