Removed old menu parsing

[gosa.git] / plugins / admin / groups / class_groupAcl.inc

diff --git a/plugins/admin/groups/class_groupAcl.inc b/plugins/admin/groups/class_groupAcl.inc
index cc5c435823d6421c55c76a864dc77c2e871c5e75..706edc95a1753f4c951769670c2a54b576a30200 100644 (file)
--- 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,6 +49,9 @@ 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= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
@@ -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= "";