From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 17 Dec 2008 10:51:27 +0000 (+0000)
Subject: Updated mail group
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f3e7cd22c76dcd6a97a8ba3c7917ffc180682a34;p=gosa.git

Updated mail group
-Don't save acls twice


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13304 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 735c3de1a..0d64e10c0 100644
--- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
+++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
@@ -255,8 +255,6 @@ class mailgroup extends plugin
       new log("view","groups/".get_class($this),$this->dn);
     }
 
-    $this->get_member();
- 
     /****************
       Account status
      ****************/
@@ -720,6 +718,12 @@ class mailgroup extends plugin
     $member = $this->get_member();
     $new_folder_acls = array("anyone" => $this->folder_acls['__anyone__']);
     foreach($member['mail'] as $uid => $mail){
+
+      /* Do not save overridden acls */
+      if(isset($this->folder_acls[$mail])){
+        continue;
+      }
+
       $this->acl[] = $mail." ".$this->folder_acls['__member__'];
       $new_folder_acls[$mail]=$this->folder_acls['__member__'];
     }
@@ -730,7 +734,7 @@ class mailgroup extends plugin
     }
     $this->folder_acls = $new_folder_acls;
     $this->acl = array_unique($this->acl);
-      
+     
     /* Call parents save to prepare $this->attrs */
     plugin::save();