X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupAcl.inc;h=706edc95a1753f4c951769670c2a54b576a30200;hb=abc8a9b8c6eb1bac83a968b1525541c0f439d77f;hp=3ef237aa9b5a4ab2e6fa46795e57f8d8bf76744f;hpb=e299f0ca47a924516f2afbe4e922f2418b75315c;p=gosa.git diff --git a/plugins/admin/groups/class_groupAcl.inc b/plugins/admin/groups/class_groupAcl.inc index 3ef237aa9..706edc95a 100644 --- a/plugins/admin/groups/class_groupAcl.inc +++ b/plugins/admin/groups/class_groupAcl.inc @@ -32,7 +32,8 @@ class acl extends plugin /* WorkAround */ include "acl_definition.inc"; $this->objects= $ACLD; - $this->object= reset(array_keys($this->objects)); + $tmp= array_keys($this->objects); + $this->object= reset($tmp); $this->selfflag= FALSE; if (isset($this->attrs['gosaSubtreeACL'][0])){ @@ -48,9 +49,12 @@ class acl extends plugin function execute() { + /* Call parent execute */ + plugin::execute(); + /* Do we represent a valid group? */ if (!$this->is_account && $this->parent == NULL){ - $display= " ". + $display= "\"\" ". _("This 'dn' is no acl container.").""; return ($display); } @@ -108,7 +112,7 @@ class acl extends plugin if ($this->object == "all"){ $this->current_acl= preg_replace ( "/[,]?all[,]?/", "", $this->current_acl); } - $this->current_acl= preg_replace ( "/[,]?$this->object#[^,]*[,]?/", "", $this->current_acl); + $this->current_acl= preg_replace ( "/[^a-z0-9A-Z]$this->object#[^,]*[,]?/", "", $this->current_acl); /* assemble new attributes */ $attrs= ""; @@ -202,7 +206,7 @@ class acl extends plugin asort ($name); # Generate checklist - $display.= "\n"; + $display.= "
\n"; $switch= 0; foreach ($name as $key => $val){ if ($switch == 0){