-<?php
-/******************************************************************
- ** IMAP SEARCH ROUTIES
- *****************************************************************/
- if (!isset($imap_php))
- include("../functions/imap.php");
- if (!isset($date_php))
- include("../functions/date.php");
- if (!isset($array_php))
- include("../functions/array.php");
- if (!isset($mailbox_display_php))
- include("../functions/mailbox_display.php");
- if (!isset($mime_php))
- include("../functions/mime.php");
-
- $imap_search_php = true;
-
-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 ($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", 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
- $errors = $errors.$readin[$c];
- $c++;
- }
-
- #If nothing is found * SEARCH should be the first error else echo errors
- if (strstr($errors,"* SEARCH")) {
- echo "<br><CENTER>No Messages Found</CENTER>";
- return;
- } else {
- 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++) {
- $messagelist[$q] = trim($messagelist[$q]);
- if ($mailbox == $sent_folder)
- $hdr = sqimap_get_small_header ($imapConnection, $messagelist[$q], true);
- else
- $hdr = sqimap_get_small_header ($imapConnection, $messagelist[$q], false);
-
- $from[$q] = $hdr->from;
- $date[$q] = $hdr->date;
- $subject[$q] = $hdr->subject;
- $to[$q] = $hdr->to;
- $priority[$q] = $hdr->priority;
- $cc[$q] = $hdr->cc;
- $id[$q] = $messagelist[$q];
-
- $flags[$q] = sqimap_get_flags ($imapConnection, $messagelist[$q]);
- }
-
- $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];
-
- $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');