From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 22 Nov 2007 12:51:57 +0000 (+0000)
Subject: Tested shared folder with kolab.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e36f7c9f49919bffaba77a2363a153c48955660;p=gosa.git

Tested shared folder with kolab.
-Some minor fixes, about default acls for newly created entries.


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

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index 3dbdf1b62..60d3ae267 100644
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -272,7 +272,8 @@ class mailgroup extends plugin
       }
       /* Append an empty entry, for special acl handling */
       if(count($this->imapacl)==2){
-        $this->imapacl[''] ="";
+        $this->imapacl[''] ="lrsw";
+        $this->indexed_user[] = ''; 
       }
   
     }else{ // Not kolab 
@@ -366,7 +367,7 @@ class mailgroup extends plugin
 
     /* Add ACL? */
     if (isset($_POST["add_acl"])){
-      $this->imapacl[""]= "l";
+      $this->imapacl[""]= "lrsw";
     }
     foreach ($this->indexed_user as $nr => $user){
       if (isset($_POST["del_$nr"])){
@@ -576,7 +577,7 @@ class mailgroup extends plugin
         $tmp.= "</select>&nbsp;";
         if ($nr == $count - 1){
         }
-        if ($count > 3){
+        if ($count > 2){
           $tmp.= "<input type=submit value=\""._("Remove")."\" ".
             "name=\"del_$nr\" $perm></td></tr>";
         }
@@ -841,6 +842,7 @@ I: Only insider delivery */
           /* In case of kolab methods add acl attribute too */
           if(preg_match("/olab/i",$this->mmethod)){
             $this->attrs['acl'][]= $name." ".$acl;
+            unset($this->imapacl[$user]);
           }
           $this->imapacl[$name] = $acl;
         }else{
@@ -858,7 +860,7 @@ I: Only insider delivery */
         $this->imapacl[$user] = $acl;
       }
     }
-  
+ 
     if ((!$this->is_template)&&(!empty($this->gosaMailServer))){
       $method= new $this->method($this->config);
       $method->fixAttributesOnStore($this);