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

* ActiveDirectory/Mail: fix groups as distribution lists

Browse Source
This commit is contained in:
Ralf Becker 2020-10-22 18:06:10 +02:00
parent 85a7679049
commit 0b0aae31a3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/Contacts/Ads.php
View File

@ -104,6 +104,7 @@ class Ads extends Ldap
// get filter for accounts (incl. additional filter from setup)
$this->accountsFilter = $this->accounts_ads->type_filter('u');
$this->contactsFilter = "(|(objectclass=contact)$this->accountsFilter)";
if ($ds)
{

8
api/src/Contacts/Ldap.php
View File

@ -76,6 +76,12 @@ class Ldap
*/
var $accountsFilter = '(objectclass=posixaccount)';
/**
* Filter used for all addressbooks
* @var string
*/
var $contactsFilter = '(objectclass=inetorgperson)';
/**
* @var string $allContactsDN holds the base DN of all addressbook
*/
@ -825,7 +831,7 @@ class Ldap
$objectFilter = $this->accountsFilter;
break;
default:
$objectFilter = '(objectclass=inetorgperson)';
$objectFilter = $this->contactsFilter;
break;
}
// exclude expired accounts