lib/Kolab public_html/index.php

[Thomas Brüderli]

 lib/Kolab/FreeBusy/DirectoryLDAP.php |    3 +--
 public_html/index.php                |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0129dbeec59b359d184b531531e4f2346259e8a0
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Apr 24 09:25:48 2014 -0400

    Adapt to changed Net_LDAP3 API; decode requested email address from URL

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()) {
diff --git a/public_html/index.php b/public_html/index.php
index 5f8058b..08bcbd9 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -81,7 +81,7 @@ if ($config->valid()) {
 
 	// remove file extension
 	if (preg_match('/^(.+)\.([ipx]fb)$/i', $user, $m)) {
-		$user = $m[1];
+		$user = urldecode($m[1]);
 		$extended = $m[2] == 'xfb';
 	}