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 a41eaf5..b771b32 100644 (file)
--- 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 5b7c9a8..47ad6a3 100644 (file)
--- 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 50bc4a9..6d08063 100644 (file)
--- 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),