From 1d57b61644607aeb5da6d2f2246d5b887e1eaf20 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 20 Apr 2010 06:58:28 +0000 Subject: [PATCH] fixed handling of group acl: addressbook eg. is NOT using it at all --- addressbook/inc/class.addressbook_hooks.inc.php | 13 ++++++++++++- addressbook/setup/setup.inc.php | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php index 32cf3246dc..a9c848d857 100644 --- a/addressbook/inc/class.addressbook_hooks.inc.php +++ b/addressbook/inc/class.addressbook_hooks.inc.php @@ -5,7 +5,7 @@ * @link http://www.egroupware.org * @package addressbook * @author Ralf Becker - * @copyright (c) 2006-9 by Ralf Becker + * @copyright (c) 2006-10 by Ralf Becker * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @version $Id$ */ @@ -365,4 +365,15 @@ class addressbook_hooks // addressbook uses group-acl, only if contacts-backend is NOT LDAP, as the ACL can not be modified there return $GLOBALS['egw_info']['server']['contact_repository'] != 'ldap'; } + + /** + * For which groups should no group acl be used: addressbook always + * + * @param string|array $data + * @return boolean|array true, false or array with group-account_id's + */ + static function not_enum_group_acls($data) + { + return true; + } } diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php index 62104f4808..6e476fc8f9 100755 --- a/addressbook/setup/setup.inc.php +++ b/addressbook/setup/setup.inc.php @@ -43,6 +43,7 @@ $setup_info['addressbook']['hooks']['calendar_resources'] = 'addressbook_hooks:: $setup_info['addressbook']['hooks']['edit_user'] = 'addressbook_hooks::edit_user'; $setup_info['addressbook']['hooks'][] = 'config'; $setup_info['addressbook']['hooks']['group_acl'] = 'addressbook_hooks::group_acl'; +$setup_info['addressbook']['hooks']['not_enum_group_acls'] = 'addressbook_hooks::not_enum_group_acls'; /* Dependencies for this app to work */ $setup_info['addressbook']['depends'][] = array(