From d3f908b8b1bd03f3429fda88518028b1ae9d4cbb Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Wed, 29 Apr 2009 10:19:23 +0200 Subject: [PATCH] Allow other test operations. --- framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php index b59407f26..7fc44b2c8 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php @@ -575,8 +575,13 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server */ protected function &buildSearchQuery($criteria) { + if (!is_array($criteria)) { + throw new Horde_Kolab_Server_Exception(sprintf("Invalid search criteria \"%s\"!", + $criteria), + Horde_Kolab_Server_Exception::SYSTEM); + } if (isset($criteria['field'])) { - $rhs = $criteria['test']; + $rhs = isset($criteria['test']) ? $criteria['test'] : ''; /* Keep this in for reference as we did not really test servers with different encoding yet */ // require_once 'Horde/String.php'; // require_once 'Horde/NLS.php'; @@ -585,6 +590,8 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server case '=': $op = 'equals'; break; + default: + $op = $criteria['op']; } return Net_LDAP2_Filter::create($this->mapField($criteria['field']), $op, $rhs); -- 2.11.0