Masato

[squirrelmail.git] / functions / imap_search.php

diff --git a/functions/imap_search.php b/functions/imap_search.php
index fb9e95b53b1115e462ca796696863ad59e247431..463d69089485857e47a8c0f2d2b4690d017247d0 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -45,11 +45,17 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
 
     if ($imap_server_type == 'macosx') {
         foreach ($multi_search as $multi_search_part) {
+            if (strtoupper($languages[$squirrelmail_language]['CHARSET']) == 'ISO-2022-JP') {
+                $multi_search_part = mb_convert_encoding($multi_search_part, 'JIS', 'auto');
+            }
             $search_string .= $search_where . ' ' .$multi_search_part . ' ';
         }
     }
     else {
         foreach ($multi_search as $multi_search_part) {
+            if (strtoupper($languages[$squirrelmail_language]['CHARSET']) == 'ISO-2022-JP') {
+                $multi_search_part = mb_convert_encoding($multi_search_part, 'JIS', 'auto');
+            }
             $search_string .= $search_where . ' {' . strlen($multi_search_part)
                 . "}\r\n" . $multi_search_part . ' ';
         }