From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 29 Apr 2009 08:21:21 +0000 (+0200)
Subject: Fix searching for '*'
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c3f65c038d6315cbf3a2f9a79a03d670e9d46776;p=horde.git

Fix searching for '*'
---

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Address.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Address.php
index a41eaf5bd..b771b32f5 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Address.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Address.php
@@ -60,15 +60,13 @@ class Horde_Kolab_Server_Object_Kolab_Address extends Horde_Kolab_Server_Object_
     {
         $criteria = array('AND' => array(
                               array('field' => self::ATTRIBUTE_SN,
-                                    'op'    => '=',
-                                    'test'  => '*'),
+                                    'op'    => 'any'),
                               array('field' => self::ATTRIBUTE_OC,
                                     'op'    => '=',
                                     'test'  => self::OBJECTCLASS_INETORGPERSON),
                               array('NOT' => array(
                                         array('field' => self::ATTRIBUTE_SID,
-                                              'op'    => '=',
-                                              'test'  => '*'),
+                                              'op'    => 'any'),
                                     ),
                               ),
                           ),
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Adminrole.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Adminrole.php
index 5b7c9a807..47ad6a31c 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Adminrole.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Adminrole.php
@@ -55,11 +55,9 @@ class Horde_Kolab_Server_Object_Kolab_Adminrole extends Horde_Kolab_Server_Objec
 
         $criteria = array('AND' => array(
                               array('field' => self::ATTRIBUTE_CN,
-                                    'op'    => '=',
-                                    'test'  => '*'),
+                                    'op'    => 'any'),
                               array('field' => self::ATTRIBUTE_SN,
-                                    'op'    => '=',
-                                    'test'  => '*'),
+                                    'op'    => 'any'),
                               array('field' => self::ATTRIBUTE_OC,
                                     'op'    => '=',
                                     'test'  => self::OBJECTCLASS_INETORGPERSON),
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Distlist.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Distlist.php
index 50bc4a9cc..6d0806349 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Distlist.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/Distlist.php
@@ -37,8 +37,7 @@ class Horde_Kolab_Server_Object_Kolab_Distlist extends Horde_Kolab_Server_Object
     {
         $criteria = array('AND' => array(
                               array('field' => self::ATTRIBUTE_MAIL,
-                                    'op'    => '=',
-                                    'test'  => '*'),
+                                    'op'    => 'any'),
                               array('field' => self::ATTRIBUTE_OC,
                                     'op'    => '=',
                                     'test'  => self::OBJECTCLASS_KOLABGROUPOFNAMES),