From a9a4f5fb7f5d0edc22bf74ffd7ed0bad6ab8484c Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 25 Aug 2010 21:47:35 -0600 Subject: [PATCH] stripos() exists in PHP 5 --- turba/lib/Driver/Kolab.php | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) 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']; - } } } } -- 2.11.0