X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=7794caa68438c069704fcce8683bb0e422e6f170;hb=fc380412e4affcb0ff647acbf72b0baa28699fde;hp=5028a810c25d6565b3b3c23b4826edad7d27fd2d;hpb=d6c32258c05219670ab3b4ae2d460d844ea9a247;p=squirrelmail.git

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 5028a810..7794caa6 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -3,13 +3,14 @@
 /**
  * imap_search.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * IMAP search routines
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage imap
  * @deprecated This search interface has been largely replaced by asearch
  */
 
@@ -23,14 +24,11 @@ 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,
-	   $imap_server_type;
+    global $squirrelmail_language, $languages, $pos, $allow_charset_search,
+           $imap_server_type;
 
     $pos = $search_position;
 
-    $urlMailbox = urlencode($mailbox);
-
     /* construct the search query, taking multiple search terms into account */
     $multi_search = array();
     $search_what  = trim($search_what);
@@ -38,7 +36,7 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     $multi_search = explode(' ', $search_what);
     $search_string = '';
 
-    /* it seems macosx does not support the prefered search 
+    /* it seems macosx and hmailserver do 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
@@ -46,7 +44,7 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
        on the client side, but should be fixed on the server
        as per the RFC */
 
-    if ($imap_server_type == 'macosx') {
+    if ($imap_server_type == 'macosx' || $imap_server_type == 'hmailserver') {
         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');
@@ -70,20 +68,20 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     if ($allow_charset_search && isset($languages[$squirrelmail_language]['CHARSET']) &&
         $languages[$squirrelmail_language]['CHARSET']) {
         $ss = "SEARCH CHARSET "
-            . strtoupper($languages[$squirrelmail_language]['CHARSET']) 
+            . strtoupper($languages[$squirrelmail_language]['CHARSET'])
             . " ALL $search_string";
     } else {
         $ss = "SEARCH ALL $search_string";
     }
 
     /* 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']) 
+    if (isset($languages[$squirrelmail_language]['CHARSET'])
         && strtolower($result) == 'no') {
         $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_string";
-        $readin = sqimap_run_command ($imapConnection, $ss, true, 
+        $readin = sqimap_run_command ($imapConnection, $ss, true,
                                       $result, $message);
     }
 
@@ -116,13 +114,10 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     for ($q = 0; $q < $cnt; $q++) {
         $id[$q] = trim($messagelist[$q]);
     }
-    $issent = ($mailbox == $sent_folder);
 
     $msgs = fillMessageArray($imapConnection,$id,$cnt);
 
     return $msgs;
 }
 
-
-
-?>
+?>
\ No newline at end of file