Adding a strtoupper() call to make sure that charsets are passed to the imap

server in uppercase. Uw-imap seems to think that iso-8859-1 and ISO-8859-1
are two different things.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2654 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 65ea511dde1e0966bfd2c3731afe31f85d2e4c62..70793f8c437d70d1adc9c4dadd815548149eb46a 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -54,7 +54,9 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     /* now use $search_string in the imap search */
     if (isset($languages[$squirrelmail_language]['CHARSET']) &&
         $languages[$squirrelmail_language]['CHARSET']) {
-        $ss = "SEARCH CHARSET ".$languages[$squirrelmail_language]['CHARSET']." ALL $search_string";
+        $ss = "SEARCH CHARSET "
+            . strtoupper($languages[$squirrelmail_language]['CHARSET']) 
+            . " ALL $search_string";
     } else {
         $ss = "SEARCH ALL $search_string";
     }
@@ -63,9 +65,11 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     $readin = sqimap_run_command($imapConnection, $ss, true, $result, $message);
 
     /* try US-ASCII charset if search fails */
-    if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {
+    if (isset($languages[$squirrelmail_language]['CHARSET']) 
+        && strtolower($result) == 'no') {
         $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_string";
-        $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
+        $readin = sqimap_run_command ($imapConnection, $ss, true, 
+                                      $result, $message);
     }
 
     unset($messagelist);