summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-04-24 13:25:48 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2014-04-24 13:25:48 (GMT)
commit0129dbeec59b359d184b531531e4f2346259e8a0 (patch)
treeed3f86fadba712f82918d8b43ae3f785ca1df87c /lib
parentd8cf3d34722af8379cadbd828efb3c0b962162d4 (diff)
downloadkolab-freebusy-0129dbeec59b359d184b531531e4f2346259e8a0.tar.gz
Adapt to changed Net_LDAP3 API; decode requested email address from URL
Diffstat (limited to 'lib')
-rw-r--r--lib/Kolab/FreeBusy/DirectoryLDAP.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Kolab/FreeBusy/DirectoryLDAP.php b/lib/Kolab/FreeBusy/DirectoryLDAP.php
index 84248fa..ea920d0 100644
--- a/lib/Kolab/FreeBusy/DirectoryLDAP.php
+++ b/lib/Kolab/FreeBusy/DirectoryLDAP.php
@@ -50,7 +50,6 @@ class DirectoryLDAP extends Directory
'port' => $host['port'] ?: 389,
'use_tls' => $host['scheme'] == 'tls' || $host['scheme'] == 'ldaps',
'root_dn' => $config['base_dn'],
- 'return_attributes' => Config::convert($config['attributes'], Config::ARR),
'log_hook' => array($this, 'log'),
) + $config;
@@ -102,7 +101,7 @@ class DirectoryLDAP extends Directory
if ($this->ready) {
// search with configured filter
$filter = preg_replace('/%s/i', $user, $this->config['filter']);
- $ldapresult = $this->ldap->search($this->config['base_dn'], $filter, 'sub');
+ $ldapresult = $this->ldap->search($this->config['base_dn'], $filter, 'sub', Config::convert($this->config['attributes'], Config::ARR));
// got a valid result
if ($ldapresult && $ldapresult->count()) {