X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=05cf2edde7916440c69e74355979d9585a2f70ba;hb=bb50b50818e1eb3b2ff8f8c49883c1a7f19707e5;hp=1a2d9008f40940d6bc6742ef659e375be8fd8da7;hpb=dba269b1a46865b6af9f2a1a4147fb9f566630bd;p=squirrelmail.git

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 1a2d9008..05cf2edd 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -3,25 +3,29 @@
 /**
  * imap_search.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * IMAP search routines
  *
  * $Id$
+ * @package squirrelmail
+ * @deprecated This search interface has been largely replaced by asearch
  */
 
-require_once('../functions/imap.php');
-require_once('../functions/date.php');
-require_once('../functions/array.php');
-require_once('../functions/mailbox_display.php');
-require_once('../functions/mime.php');
+/**
+ * Load up a bunch of SM functions */
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/date.php');
+require_once(SM_PATH . 'functions/mailbox_display.php');
+require_once(SM_PATH . 'functions/mime.php');
 
 function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
                        $color, $search_position = '', $search_all, $count_all) {
 
     global $message_highlight_list, $squirrelmail_language, $languages,
-           $index_order, $pos, $allow_charset_search, $uid_support;
+           $index_order, $pos, $allow_charset_search, 
+	   $imap_server_type;
 
     $pos = $search_position;
 
@@ -33,9 +37,31 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     $search_what  = ereg_replace('[ ]{2,}', ' ', $search_what);
     $multi_search = explode(' ', $search_what);
     $search_string = '';
-    foreach ($multi_search as $multi_search_part) {
-        $search_string .= $search_where . ' {' . strlen($multi_search_part)
-            . "}\r\n" . $multi_search_part . ' ';
+
+    /* it seems macosx does not support the prefered search 
+       syntax so we fall back to the older style. This IMAP
+       server has a problem with multiple search terms. Instead
+       of returning the messages that match all the terms it
+       returns the messages that match each term. Could be fixed
+       on the client side, but should be fixed on the server
+       as per the RFC */
+
+    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 . ' ';
+        }
     }
 
     $search_string = trim($search_string);
@@ -51,7 +77,7 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     }
 
     /* read data back from IMAP */
-    $readin = sqimap_run_command($imapConnection, $ss, false, $result, $message, $uid_support);
+    $readin = sqimap_run_command($imapConnection, $ss, false, $result, $message, TRUE);
 
     /* try US-ASCII charset if search fails */
     if (isset($languages[$squirrelmail_language]['CHARSET']) 
@@ -78,12 +104,9 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     /* If nothing is found * SEARCH should be the first error else echo errors */
     if (isset($errors)) {
         if (strstr($errors,'* SEARCH')) {
-            if ($search_all != 'all') {
-                echo '<br><CENTER>' . _("No Messages Found") . '</CENTER>';
-            }
-            return;
+            return array();
         }
-        echo "<!-- $errors -->";
+        echo '<!-- '.htmlspecialchars($errors) .' -->';
     }
 
 
@@ -95,7 +118,7 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     }
     $issent = ($mailbox == $sent_folder);
 
-    $msgs = fillMessageArray($imapConnection,$id,$issent,$cnt);
+    $msgs = fillMessageArray($imapConnection,$id,$cnt);
 
     return $msgs;
 }