Browse Source

Fix parsing ldap URI for cases where hostname is non-empty

pull/229/merge
Aleksander Machniak 11 years ago
parent
commit
5aa1d2005b
  1. 3
      program/lib/Roundcube/rcube_ldap.php

3
program/lib/Roundcube/rcube_ldap.php

@ -698,8 +698,9 @@ class rcube_ldap extends rcube_addressbook
for ($i=0; $i < $entry['memberurl']['count']; $i++) {
// extract components from url
if (!preg_match('!ldap:///([^\?]+)\?\?(\w+)\?(.*)$!', $entry['memberurl'][$i], $m))
if (!preg_match('!ldap://[^/]*/([^\?]+)\?\?(\w+)\?(.*)$!', $entry['memberurl'][$i], $m)) {
continue;
}
// add search filter if any
$filter = $this->filter ? '(&(' . $m[3] . ')(' . $this->filter . '))' : $m[3];

Loading…
Cancel
Save