From: hickert Date: Wed, 24 Mar 2010 09:37:27 +0000 (+0000) Subject: Updated ACL stuff X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=75c736221d7f63d86cef12865d6a58877ebdec25;p=gosa.git Updated ACL stuff -class_acl.inc has to act on acl_category 'acl/*' in all cases. Do allow to override it -class_plugin has now ACL debugging infos . git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17038 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc index 3611ac7fe..92f98e384 100644 --- a/gosa-core/include/class_acl.inc +++ b/gosa-core/include/class_acl.inc @@ -1354,6 +1354,12 @@ class acl extends plugin } } + + // We are only interessted in our own acls ... + function set_acl_category($category) + { + plugin::set_acl_category("acl"); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc index d0c7b8096..167009672 100644 --- a/gosa-core/include/class_plugin.inc +++ b/gosa-core/include/class_plugin.inc @@ -1516,12 +1516,14 @@ class plugin function set_acl_base($base) { + @DEBUG (DEBUG_ACL, __LINE__, __FUNCTION__, __FILE__,"".$base."","ACL-Base: "); $this->acl_base= $base; } function set_acl_category($category) { + @DEBUG (DEBUG_ACL, __LINE__, __FUNCTION__, __FILE__,"".$category."(/".get_class($this).")","ACL-Category: "); $this->acl_category= "$category/"; }