From 9d78c68cbf5ce86f02e8fa16814293cdfd204432 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 29 Jul 2015 14:38:21 -0400
Subject: [PATCH] Fix so imap folder attribute comparisons are case-insensitive (#1490466) + make in_array_nocase() much faster for ASCII strings

---
 plugins/virtuser_query/virtuser_query.php |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index a0b7482..c08d6bd 100644
--- a/plugins/virtuser_query/virtuser_query.php
+++ b/plugins/virtuser_query/virtuser_query.php
@@ -70,13 +70,13 @@
             if (strpos($sql_arr[0], '@')) {
                 if ($p['extended'] && count($sql_arr) > 1) {
                     $result[] = array(
-                        'email'         => rcube_utils::idn_to_ascii($sql_arr[0]),
-                        'name'          => $sql_arr[1],
-                        'organization'  => $sql_arr[2],
-                        'reply-to'      => rcube_utils::idn_to_ascii($sql_arr[3]),
-                        'bcc'           => rcube_utils::idn_to_ascii($sql_arr[4]),
-                        'signature'     => $sql_arr[5],
-                        'html_signature' => (int)$sql_arr[6],
+                        'email'          => rcube_utils::idn_to_ascii($sql_arr[0]),
+                        'name'           => (string) $sql_arr[1],
+                        'organization'   => (string) $sql_arr[2],
+                        'reply-to'       => (string) rcube_utils::idn_to_ascii($sql_arr[3]),
+                        'bcc'            => (string) rcube_utils::idn_to_ascii($sql_arr[4]),
+                        'signature'      => (string) $sql_arr[5],
+                        'html_signature' => (int) $sql_arr[6],
                     );
                 }
                 else {

--
Gitblit v1.9.1