X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=fb9e95b53b1115e462ca796696863ad59e247431;hb=cf0d436aeba404fcede2204d19e03efc2e0422c2;hp=96cb7bb7d0e00c27e8bbd7b82be0bfdd9a8c71d0;hpb=1c72b151600d032fa186f8bbe6190fdcd1710ec6;p=squirrelmail.git
diff --git a/functions/imap_search.php b/functions/imap_search.php
index 96cb7bb7..fb9e95b5 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -17,148 +17,103 @@ require_once('../functions/array.php');
require_once('../functions/mailbox_display.php');
require_once('../functions/mime.php');
-function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color, $search_position = '') {
+function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
+ $color, $search_position = '', $search_all, $count_all) {
- global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
- global $pos;
+ 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 */
- if (isset($languages[$squirrelmail_language]['CHARSET']) &&
- $languages[$squirrelmail_language]['CHARSET']) {
- $ss = "SEARCH CHARSET ".$languages[$squirrelmail_language]['CHARSET']." ALL $search_where \"$search_what\"";
- } else {
- $ss .= "SEARCH ALL $search_where \"$search_what\"";
+ /* 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) {
+ $search_string .= $search_where . ' ' .$multi_search_part . ' ';
+ }
}
+ else {
+ foreach ($multi_search as $multi_search_part) {
+ $search_string .= $search_where . ' {' . strlen($multi_search_part)
+ . "}\r\n" . $multi_search_part . ' ';
+ }
+ }
+
+ $search_string = trim($search_string);
- /* Read Data Back From IMAP */
- $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
- if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {
- $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"";
- $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
+ /* 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";
}
- unset($messagelist); $msgs=""; $c = 0;
+ /* read data back from IMAP */
+ $readin = sqimap_run_command($imapConnection, $ss, false, $result, $message, $uid_support);
- /* Keep going till we find the SEARCH responce */
- while ($c < count( $readin )) {
+ /* 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);
+ }
- /* 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++;
+ 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) && strstr($errors,"* SEARCH")) {
- echo '