mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 00:29:38 +01:00
moved rest of the addressbook group-acl code to addressbook
This commit is contained in:
parent
b17df8df9b
commit
4bca7982d6
@ -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';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user