From f81294d8e3e589555212304a0b450faee58d01fd Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 2 Dec 2009 11:39:40 +0000 Subject: [PATCH] Updated changelog, speed up object removal git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14859 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/Changelog | 1 + gosa-core/plugins/admin/groups/class_groupGeneric.inc | 6 ++---- gosa-core/plugins/personal/generic/class_user.inc | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gosa-core/Changelog b/gosa-core/Changelog index d4733b031..524cb4578 100644 --- a/gosa-core/Changelog +++ b/gosa-core/Changelog @@ -5,6 +5,7 @@ GOsa2 changelog - Added more information to DHCP service dialog (thanks to Mathieu) - Fixed generation of kerberos host keys when DNS is enabled - Fixed template error message when no sshkey plugin is enabled + - Speed up group and user removal by large factors * gosa 2.6.6 - Added ssh public key management diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc index 8440c1c08..82fed9121 100644 --- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc +++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc @@ -804,10 +804,8 @@ class group extends plugin $acl->save(); } - /* Remove ACL dependencies too, - */ - $tmp = new acl($this->config,$this->parent,$this->dn); - $tmp->remove_acl(); + /* Remove ACL dependencies, too */ + acl::remove_acl_for($this->dn); /* Send signal to the world that we've done */ $this->handle_post_events("remove"); diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc index a64348904..2ba03a1f2 100644 --- a/gosa-core/plugins/personal/generic/class_user.inc +++ b/gosa-core/plugins/personal/generic/class_user.inc @@ -737,8 +737,7 @@ class user extends plugin } /* Remove ACL dependencies too */ - $tmp = new acl($this->config,$this->parent,$this->dn); - $tmp->remove_acl(); + acl::remove_acl_for($this->dn); /* Optionally execute a command after we're done */ $this->handle_post_events("remove",array("uid" => $this->uid)); -- 2.30.2