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.

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
index 81587a1..a2645d3 100644 (file)
--- 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;
                     }