X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=934bce16bf4e3ba70887d02e9b7464ea7a1ffaa9;hb=034fddf9fea6ada6e708501c95b113ae6b9126ea;hp=65ea511dde1e0966bfd2c3731afe31f85d2e4c62;hpb=b1e297949f09092a5b8b7e5a1dd93308557985b4;p=squirrelmail.git
diff --git a/functions/imap_search.php b/functions/imap_search.php
index 65ea511d..934bce16 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -11,17 +11,17 @@
* $Id$
*/
-require_once('../functions/imap.php');
-require_once('../functions/date.php');
-require_once('../functions/array.php');
-require_once('../functions/mailbox_display.php');
-require_once('../functions/mime.php');
+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 $msgs, $message_highlight_list, $squirrelmail_language, $languages,
- $index_order, $pos;
+ global $message_highlight_list, $squirrelmail_language, $languages,
+ $index_order, $pos, $allow_charset_search, $uid_support,
+ $imap_server_type;
$pos = $search_position;
@@ -33,49 +33,63 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
$search_what = ereg_replace('[ ]{2,}', ' ', $search_what);
$multi_search = explode(' ', $search_what);
$search_string = '';
- foreach ($multi_search as $multi_search_part) {
- $search_string .= $search_where . ' "' . $multi_search_part . '" ';
- }
-/*
- if (count($multi_search)==1) {
- $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"';
+
+ /* 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');
+ }
+ $search_string .= $search_where . ' ' .$multi_search_part . ' ';
+ }
}
else {
- $search_string = '';
- $count = count($multi_search);
- for ($x=0;$x<$count;$x++) {
- trim($multi_search[$x]);
- $search_string = $search_string . ' ' . $search_where . ' "' . $multi_search[$x] . '"';
+ 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');
}
+ $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 (isset($languages[$squirrelmail_language]['CHARSET']) &&
+ if ($allow_charset_search && isset($languages[$squirrelmail_language]['CHARSET']) &&
$languages[$squirrelmail_language]['CHARSET']) {
- $ss = "SEARCH CHARSET ".$languages[$squirrelmail_language]['CHARSET']." ALL $search_string";
+ $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, true, $result, $message);
+ $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') {
+ 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);
+ $readin = sqimap_run_command ($imapConnection, $ss, true,
+ $result, $message);
}
unset($messagelist);
- $msgs = '';
/* 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 = explode(' ', substr($readin_part, 9));
+ $messagelist = preg_split("/ /", substr($readin_part, 9));
} else if (isset($errors)) {
$errors = $errors.$readin_part;
} else {
@@ -86,129 +100,25 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
/* If nothing is found * SEARCH should be the first error else echo errors */
if (isset($errors)) {
if (strstr($errors,'* SEARCH')) {
- if ($search_all != 'all') {
- echo '