summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8afba4d)
raw | patch | inline | side by side (parent: 8afba4d)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Fri, 4 Apr 2008 11:55:11 +0000 (11:55 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Fri, 4 Apr 2008 11:55:11 +0000 (11:55 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@10210 594d385d-05f5-0310-b6e9-bd551577e9d8
plugins/admin/groups/class_groupMail.inc | patch | blob | history |
index bc1e0893ef7e86e622f9fbb5457a8c8d7ee61ef2..95db045c46e54df4d31eb6dbcffca2983d28014f 100644 (file)
because the kolab deamon will set the acls for us.
*/
+ $acls_set_for = array();
foreach ($this->imapacl as $user => $acl){
/* Skip empty entries */
if(isset($attrs['mail'][0])){
$name = $attrs[$uattrib][0];
- $this->attrs['acl'][]= $name." ".$acl;
+
+ /* Do not overwrite manually set ACLs with group member acls
+ */
+ if(!in_array($name,$acls_set_for)){
+ $this->attrs['acl'][]= $name." ".$acl;
+ }
+ $acls_set_for[] = $name;
+
/* Do not write imap acl directly i nkolab mode, let the kolab deamon do this. */
unset($this->imapacl[$user]);
/* Seems to be a manually a added acl
* Write this acl.
*/
- $this->attrs['acl'][]= $user." ".$acl;
+
+ /* Do not overwrite manually set ACLs with group member acls
+ */
+ if(!in_array($user,$acls_set_for)){
+ $this->attrs['acl'][]= $user." ".$acl;
+ $acls_set_for[] = $user;
+ }
/* In case of kolab methods, let the deamon add the imap acls */
if(preg_match("/olab/i",$this->mmethod)){