in sqgetGlobalVar, reset $value if it is not found.

[squirrelmail.git] / functions / imap_search.php

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 90f288a9a7c6ada896afad89d9967b641a3ce847..7794caa68438c069704fcce8683bb0e422e6f170 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -3,7 +3,7 @@
 /**
  * imap_search.php
  *
- * Copyright (c) 1999-2004 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
@@ -25,12 +25,10 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
                        $color, $search_position = '', $search_all, $count_all) {
 
     global $squirrelmail_language, $languages, $pos, $allow_charset_search,
-              $imap_server_type;
+           $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');
@@ -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