From d5794f2f783d5978a1893a7de67f2fa97a09a684 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 2 Dec 2005 14:02:25 +0000 Subject: [PATCH] Removed unwanted print ^^ git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2210 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/acl_definition.inc | 2 +- plugins/admin/groups/class_groupGeneric.inc | 11 +++++++---- plugins/admin/groups/class_groupManagement.inc | 1 - 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc index deafb3eb8..619c3c62f 100644 --- a/plugins/admin/groups/acl_definition.inc +++ b/plugins/admin/groups/acl_definition.inc @@ -40,6 +40,7 @@ $ACLD['blocklists']= array("cn", "delete", "description", "goFaxBlocklist"); +$ACLD['ogroup']= array("ogroup","create","delete","cn", "description", "gosaGroupObjects","base"); $ACLD['group']= array("cn", "create", "delete", @@ -47,7 +48,6 @@ $ACLD['group']= array("cn", "force_gid", "password", "gidNumber"); -$ACLD['ogroup']= array("ogroup","create","delete","cn", "description", "gosaGroupObjects","base"); $ACLD['appgroup']= array(); $ACLD['all']= array(); $ACLD['mailgroup']= array("default_permission", diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc index c8378315e..8b2c2b6ae 100644 --- a/plugins/admin/groups/class_groupGeneric.inc +++ b/plugins/admin/groups/class_groupGeneric.inc @@ -158,7 +158,10 @@ class group extends plugin /* Call parent execute */ plugin::execute(); - /* Do we represent a valid group? */ + $ui= get_userinfo(); + $acla= get_permissions ($ui->dn, $ui->subtreeACL); + $this->acl= get_module_permission($acla, "group", $ui->dn); + /* Do we represent a valid group? */ if (!$this->is_account && $this->parent == NULL){ $display= "\"\" ". _("This 'dn' is no group.").""; @@ -617,9 +620,9 @@ class group extends plugin } $ui= get_userinfo(); - $acl= get_permissions ($new_dn, $ui->subtreeACL); - $acl= get_module_permission($acl, "group", $new_dn); - if (chkacl($acl, "create") != ""){ + $acl= get_permissions ($ui->dn, $ui->subtreeACL); + $acl= get_module_permission($acl, "group", $ui->dn); + if (chkacl($this->acl, "create") != ""){ $message[]= _("You have no permissions to create a group on this 'Base'."); } diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index 49cb8bf98..4f9dd7819 100644 --- a/plugins/admin/groups/class_groupManagement.inc +++ b/plugins/admin/groups/class_groupManagement.inc @@ -182,7 +182,6 @@ class groupManagement extends plugin /* Create new usertab object */ $this->grouptab= new grouptabs($this->config, $this->config->data['TABS']['GROUPTABS'], $this->dn); - $this->grouptab->set_acl(array(':all')); } /* Cancel dialogs */ -- 2.30.2