holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed handling of group acl: addressbook eg. is NOT using it at all

Browse Source
This commit is contained in:
Ralf Becker 2010-04-20 06:58:28 +00:00
parent d9117ecff0
commit 1d57b61644
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addressbook/inc/class.addressbook_hooks.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org
* @package addressbook
* @author Ralf Becker <RalfBecker@outdoor-training.de>
* @copyright (c) 2006-9 by Ralf Becker <RalfBecker@outdoor-training.de>
* @copyright (c) 2006-10 by Ralf Becker <RalfBecker@outdoor-training.de>
* @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;
}
}

1
addressbook/setup/setup.inc.php
View File

@ -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(