From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 15 Dec 2010 10:28:21 +0000 (+0000)
Subject: Applied patch for loading shared folder acls.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4612db3ec7ee65f5627a68823806933ca1b9de15;p=gosa.git

Applied patch for loading shared folder acls.



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

diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
index 67b7185f3..85df964d3 100644
--- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
+++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
@@ -98,12 +98,12 @@ class mailgroup extends plugin
         $ldap = $this->config->get_ldap_link();
         if(isset($this->attrs['acl'])){
             for($i = 0; $i < $this->attrs['acl']['count'] ; $i++){
-                $str = trim($this->attrs['acl'][$i]);
 
                 /* Be carefull here, since kolab22 uses spaces in the acls (herbert read anon/post)
                  */
-                $name = trim(preg_replace("/^([^\s]*).*$/","\\1",$str));
-                $acl  = trim(preg_replace("/^[^\s]*+\s/","",$str));
+                $str = $this->attrs['acl'][$i];
+                list($name, $acl) = preg_split("/[ ]{1}/", $str, 2);
+
                 if($name == "anyone") $name = "__anyone__";
                 $this->folder_acls[$name] = $acl;
             }
@@ -647,9 +647,9 @@ class mailgroup extends plugin
             if(isset($_POST['mail_acls_posted'])){
                 $new_acls = array();
                 foreach(array("__anyone__","__member__") as $attr){
-
-                    if(isset($_POST['acl_value_'.$attr])){ 
-                        $new_acls[$attr] = get_post('acl_value_'.$attr);
+                    $id = (isset($this->aclPostToId[$attr])) ? $this->aclPostToId[$attr] : -1;
+                    if(isset($_POST['acl_value_'.$id])){ 
+                        $new_acls[$attr] = get_post('acl_value_'.$id);
                     }else{
                         $new_acls[$attr] = $this->folder_acls[$attr];
                     }