X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_search.php;h=38832fc1be862cc1af0ec8fc60ea3d7ac8b743cb;hp=a92e8970bf65c7c4b52f746ecb381f047edb3247;hb=d672fcab6c386d4dcdb2373204e1bd3c90149bd3;hpb=76f9855ef5faf574a80c28cf521acb894b5011f9

diff --git a/functions/imap_search.php b/functions/imap_search.php
index a92e8970..38832fc1 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,155 +1,124 @@
-<?php 
-   /******************************************************************
-    ** IMAP SEARCH ROUTIES
-    ** $Id$
-    *****************************************************************/
-    
-   if (defined ('imap_search_php'))
-      return;
-   define ('imap_search_php', true);
-   
-   include("../functions/imap.php");
-   include("../functions/date.php");
-   include("../functions/array.php");
-   include("../functions/mailbox_display.php");
-   include("../functions/mime.php");
-
-
-function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color) {
-   global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
-   $urlMailbox = urlencode($mailbox);
-   
-   # Construct the Search QuERY
-   
-   if (isset($languages[$squirrelmail_language]["CHARSET"]) && $languages[$squirrelmail_language]["CHARSET"]) {
-      $ss = "a001 SEARCH CHARSET ".$languages[$squirrelmail_language]["CHARSET"]." ALL $search_where \"$search_what\"\r\n";
-   } else {
-      $ss = "a001 SEARCH ALL $search_where \"$search_what\"\r\n";
-   }
-   fputs($imapConnection,$ss);
-
-   # Read Data Back From IMAP
-   $readin = sqimap_read_data ($imapConnection, "a001", false, $result, $message);
-   if (isset($languages[$squirrelmail_language]["CHARSET"]) && strtolower($result) == "no") { 
-      $ss = "a001 SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"\r\n";
-      fputs ($imapConnection, $ss);
-      $readin = sqimap_read_data ($imapConnection, "a001", true, $result, $message);
-   }
-   unset($messagelist); $msgs=""; $c = 0;
-
-   #Keep going till we find the SEARCH responce
-   while ($c < count($readin)) {
-
-      #Check to see if a SEARCH Responce was recived
-      if (substr($readin[$c],0,9) == "* SEARCH ")
-         $messagelist = explode(" ",substr($readin[$c],9));
-      else if (isset($errors))
-         $errors = $errors.$readin[$c];
-      else
-         $errors = $readin[$c];
-      $c++;
-   }
-
-   #If nothing is found * SEARCH should be the first error else echo errors
-   if (isset($errors) && strstr($errors,"* SEARCH")) {
-      echo "<br><CENTER>No Messages Found</CENTER>";
-      return;
-   } else if (isset($errors)) {
-      echo "<!-- ".$errors." -->";
-   }
-
-   # HACKED CODED FROM ANOTHER FUNCTION, Could Probably dump this and mondify 
-   # exsitising code with a search true/false varible.
-
-
-   global $sent_folder;
-   for ($q = 0; $q < count($messagelist); $q++) {
-      $id[$q] = trim($messagelist[$q]);
-   }
-   $issent = ($mailbox == $sent_folder);
-   $hdr_list = sqimap_get_small_header_list($imapConnection, $id, $issent);
-   $flags = sqimap_get_flags_list($imapConnection, $id, $issent);
-   foreach ($hdr_list as $hdr) {
-      $from[] = $hdr->from;
-      $date[] = $hdr->date;
-      $subject[] = $hdr->subject;
-      $to[] = $hdr->to;
-      $priority[] = $hdr->priority;
-      $cc[] = $hdr->cc;
-      $size[] = $hdr->size;
-      $type[] = $hdr->type0;
-   }   
-
-   $j = 0;
-   while ($j < count($messagelist)) {
-         $date[$j] = ereg_replace('  ', ' ', $date[$j]);
-         $tmpdate = explode(" ", trim($date[$j]));
-
-         $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate);
-         $messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]);
-         $messages[$j]["ID"] = $id[$j];
-         $messages[$j]["FROM"] = decodeHeader($from[$j]);
-         $messages[$j]["FROM-SORT"] = strtolower(sqimap_find_displayable_name(decodeHeader($from[$j])));
-         $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]);
-         $messages[$j]["SUBJECT-SORT"] = strtolower(decodeHeader($subject[$j]));
-         $messages[$j]["TO"] = decodeHeader($to[$j]);
-         $messages[$j]["PRIORITY"] = $priority[$j];
-         $messages[$j]["CC"] = $cc[$j];
-		 $messages[$j]["SIZE"] = $size[$j];
-		 $messages[$j]["TYPE0"] = $type[$j];
-
-         $num = 0;
-         while ($num < count($flags[$j])) {
-            if ($flags[$j][$num] == "Deleted") {
-               $messages[$j]["FLAG_DELETED"] = true;
+<?php
+
+/**
+ * imap_search.php
+ *
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * IMAP search routines
+ *
+ * $Id$
+ */
+
+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,
+	   $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);
+    $search_what  = ereg_replace('[ ]{2,}', ' ', $search_what);
+    $multi_search = explode(' ', $search_what);
+    $search_string = '';
+
+    /* 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');
             }
-            else if ($flags[$j][$num] == "Answered") {
-               $messages[$j]["FLAG_ANSWERED"] = true;
+            $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');
             }
-            else if ($flags[$j][$num] == "Seen") {
-               $messages[$j]["FLAG_SEEN"] = true;
-            }
-            else if ($flags[$j][$num] == "Flagged") {
-               $messages[$j]["FLAG_FLAGGED"] = true;
-            }
-            $num++;
-         }
-         $j++;
-   }
-
-      /** Find and remove the ones that are deleted */
-      $i = 0;
-      $j = 0;
-      while ($j < count($messagelist)) {
-         if (isset($messages[$j]["FLAG_DELETED"]) && $messages[$j]["FLAG_DELETED"] == true) {
-            $j++;
-            continue;
-         }
-         $msgs[$i] = $messages[$j];
-
-         $i++;
-         $j++;
-      }
-      $numMessages = $i;
-
-      // There's gotta be messages in the array for it to sort them.
-
-      if (count($messagelist) > 0) {
-         $j=0;
-		 if (!isset ($msg)) { $msg = ""; }
-         mail_message_listing_beginning($imapConnection, 
-            "move_messages.php?msg=$msg&mailbox=$urlMailbox&where=".urlencode($search_where)."&what=".urlencode($search_what),
-             '', -1, '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
-             '&nbsp;');
-         
- 
-         while ($j < count($msgs)) {
-            printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what);
-            $j++;
-         }
-         echo "</table>";
-         echo "</tr></td></table>";
-      }
-   }
+            $search_string .= $search_where . ' {' . strlen($multi_search_part)
+                . "}\r\n" . $multi_search_part . ' ';
+        }
+    }
+
+    $search_string = trim($search_string);
+
+    /* now use $search_string in the imap search */
+    if ($allow_charset_search && isset($languages[$squirrelmail_language]['CHARSET']) &&
+        $languages[$squirrelmail_language]['CHARSET']) {
+        $ss = "SEARCH 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);
+
+    /* try US-ASCII charset if search fails */
+    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);
+    }
+
+    unset($messagelist);
+
+    /* Keep going till we find the SEARCH response */
+    foreach ($readin as $readin_part) {
+        /* Check to see if a SEARCH response was received */
+        if (substr($readin_part, 0, 9) == '* SEARCH ') {
+            $messagelist = preg_split("/ /", substr($readin_part, 9));
+        } else if (isset($errors)) {
+            $errors = $errors.$readin_part;
+        } else {
+            $errors = $readin_part;
+        }
+    }
+
+    /* If nothing is found * SEARCH should be the first error else echo errors */
+    if (isset($errors)) {
+        if (strstr($errors,'* SEARCH')) {
+            return array();
+        }
+        echo '<!-- '.htmlspecialchars($errors) .' -->';
+    }
+
+
+    global $sent_folder;
+
+    $cnt = count($messagelist);
+    for ($q = 0; $q < $cnt; $q++) {
+        $id[$q] = trim($messagelist[$q]);
+    }
+    $issent = ($mailbox == $sent_folder);
+
+    $msgs = fillMessageArray($imapConnection,$id,$cnt);
+
+    return $msgs;
+}
+
+
 
 ?>