From a07a642b92a10fb30630c3a5301b33e02a96fc72 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 13 Apr 2009 09:52:27 +0200 Subject: [PATCH] Do not compare uids when reading data. Encoded values will be difficult and the check for an empty result should be enough. Corrected check for empty values. --- framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php index 81587a16c..a2645d395 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php @@ -156,16 +156,7 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server Horde_Kolab_Server_Exception::EMPTY_RESULT); } - if (!isset($data[$uid])) { - throw new Horde_Kolab_Server_Exception(sprintf(_("No result found for %s"), - $uid), - Horde_Kolab_Server_Exception::EMPTY_RESULT); - } - if (is_a($data[$uid], 'PEAR_Error')) { - throw new Horde_Kolab_Server_Exception($data[$uid], - Horde_Kolab_Server_Exception::SYSTEM); - } - return $data[$uid]; + return array_pop($data); } /** @@ -194,7 +185,7 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server $values = array($values); } foreach ($values as $value) { - if (!empty($value)) { + if (!($value === null || $info[$key] === '')) { $empty = false; break; } -- 2.11.0