Patch from Jean-Charles Passard <jcharles(at)provectio.org>: allows to use either uid or id to retrieve contacts

This commit is contained in:
Ralf Becker 2009-08-22 07:58:53 +00:00
parent 7f66558a87
commit 45565d098b

View File

@ -290,7 +290,8 @@ class addressbook_ldap
} }
else else
{ {
$contact_id = ldap::quote(is_array($contact_id) ? $contact_id['id'] : $contact_id); $contact_id = ldap::quote(!is_array($contact_id) ? $contact_id :
(isset ($contact_id['id']) ? $contact_id['id'] : $contact_id['uid']));
$filter = "(|(entryUUID=$contact_id)(uid=$contact_id))"; $filter = "(|(entryUUID=$contact_id)(uid=$contact_id))";
} }
$rows = $this->_searchLDAP($GLOBALS['egw_info']['server']['ldap_contact_context'], $rows = $this->_searchLDAP($GLOBALS['egw_info']['server']['ldap_contact_context'],