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

Take other backends e.g. LDAP into account while searching for contacts

Browse Source
This commit is contained in:
Hadi Nategh 2019-07-18 16:05:35 +02:00
parent b433ed7037
commit 2a9b27e76b
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -315,28 +315,37 @@ class addressbook_bo extends Api\Contacts
$criteria['contact_email_home'][] = $criteria['contact_email'][] = $recipient = strtolower($recipient);
}
}
foreach($this->search($criteria, array('account_id', 'contact_email', 'contact_email_home', 'contact_pubkey', 'contact_id'),
'', '', '', false, 'OR', false, null) as $contact)
$filters = array(null);
// if accounts-backend is NOT SQL, we need to search the accounts separate
if ($this->so_accounts)
{
// first check for file and second for pubkey field (LDAP, AD or old SQL)
if (($content = $this->get_key($contact, $pgp)))
$filters[] = array('owner' => '0');
}
foreach ($filters as $filter)
{
foreach($this->search($criteria, array('account_id', 'contact_email', 'contact_email_home', 'contact_pubkey', 'contact_id'),
'', '', '', false, 'OR', false, $filter) as $contact)
{
$contact['email'] = strtolower($contact['email']);
if (empty($criteria['account_id']) || in_array($contact['email'], $recipients))
// first check for file and second for pubkey field (LDAP, AD or old SQL)
if (($content = $this->get_key($contact, $pgp)))
{
if (in_array($contact['email_home'], $recipients))
$contact['email'] = strtolower($contact['email']);
if (empty($criteria['account_id']) || in_array($contact['email'], $recipients))
{
$result[$contact['email_home']] = $content;
if (in_array($contact['email_home'], $recipients))
{
$result[$contact['email_home']] = $content;
}
else
{
$result[$contact['email']] = $content;
}
}
else
{
$result[$contact['email']] = $content;
$result[$contact['account_id']] = $content;
}
}
else
{
$result[$contact['account_id']] = $content;
}
}
}
return $result;