From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 26 Aug 2010 03:47:35 +0000 (-0600)
Subject: stripos() exists in PHP 5
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a9a4f5fb7f5d0edc22bf74ffd7ed0bad6ab8484c;p=horde.git

stripos() exists in PHP 5
---

diff --git a/turba/lib/Driver/Kolab.php b/turba/lib/Driver/Kolab.php
index a7d824801..a4af43a99 100644
--- a/turba/lib/Driver/Kolab.php
+++ b/turba/lib/Driver/Kolab.php
@@ -903,34 +903,13 @@ class Turba_Driver_Kolab_Wrapper_New extends Turba_Driver_Kolab_Wrapper {
                 }
             } else {
                 // 'op' is LIKE
-                if (!empty($test['begin'])) {
-                    $begin = true;
-                } else {
-                    $begin = false;
-                }
-
-                // PHP 4 compatibility
-                $has_stripos = function_exists('stripos');
-                if (!$has_stripos) {
-                    $value = strtolower($value);
-                }
-
                 foreach ($entries as $entry) {
-                    if (empty($value)) {
+                    if (empty($value) ||
+                        (isset($entry[$field]) &&
+                         !empty($test['begin']) &&
+                         (($pos = stripos($entry[$field], $value)) !== false) &&
+                         ($pos == 0))) {
                         $ids[] = $entry['uid'];
-                    } else if (isset($entry[$field])) {
-                        if ($has_stripos) {
-                            $pos = stripos($entry[$field], $value);
-                        } else {
-                            $pos = strpos(strtolower($entry[$field]), $value);
-                        }
-
-                        if ($pos === false) {
-                            continue;
-                        }
-                        if (!$begin || $pos == 0) {
-                            $ids[] = $entry['uid'];
-                        }
                     }
                 }
             }