moved rest of the addressbook group-acl code to addressbook

This commit is contained in:
Ralf Becker 2008-06-30 16:46:01 +00:00
parent b17df8df9b
commit 4bca7982d6
2 changed files with 2 additions and 6 deletions

View File

@ -317,6 +317,7 @@ class addressbook_hooks
*/ */
static function group_acl($args) static function group_acl($args)
{ {
return true; // 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';
} }
} }

View File

@ -61,11 +61,6 @@
{ {
$_POST = $this->array_stripslashes($_POST); $_POST = $this->array_stripslashes($_POST);
} }
// remove ACL from addressbook, if contacts-backend is LDAP, as the ACL can not be modified there
if ($GLOBALS['egw_info']['server']['contact_repository'] == 'ldap')
{
unset($this->apps_with_acl['addressbook']);
}
foreach($GLOBALS['egw']->hooks->process('group_acl','',true) as $app => $data) foreach($GLOBALS['egw']->hooks->process('group_acl','',true) as $app => $data)
{ {
if ($data) $this->apps_with_acl[$app] = $data; if ($data) $this->apps_with_acl[$app] = $data;