X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_search.php;h=65ea511dde1e0966bfd2c3731afe31f85d2e4c62;hp=faddd3bf2eb1a6504c5e557bb5a0d3bd618698f4;hb=b1e297949f09092a5b8b7e5a1dd93308557985b4;hpb=d4144adf2453439095a468f36c36abaa020203a5;ds=sidebyside
diff --git a/functions/imap_search.php b/functions/imap_search.php
index faddd3bf..65ea511d 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -17,87 +17,87 @@ 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 = '', $search_all, $count_all) {
+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 $msgs, $message_highlight_list, $squirrelmail_language, $languages,
+ $index_order, $pos;
$pos = $search_position;
$urlMailbox = urlencode($mailbox);
- /* Construct the Search QuERY */
-
-# account for multiple search terms
-
- $multi_search = array ();
- $search_what = ereg_replace("[ ]{2,}", ' ', $search_what);
- $multi_search = split (' ', $search_what);
- if (count($multi_search)==1) {
- $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"';
- }
- else {
- $search_string = '';
- $count = count($multi_search);
- for ($x=0;$x<$count;$x++) {
- $search_string = $search_string . ' ' . $search_where . " " . '"' . $multi_search[$x] . '" ';
- }
- }
- $search_string = trim($search_string);
-
-# now use $search_string in the imap search
+ /* 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 = '';
+ 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] . '"';
+ }
+ 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] . '"';
+ }
+ }
+*/
+ $search_string = trim($search_string);
+ /* now use $search_string in the imap search */
if (isset($languages[$squirrelmail_language]['CHARSET']) &&
$languages[$squirrelmail_language]['CHARSET']) {
$ss = "SEARCH CHARSET ".$languages[$squirrelmail_language]['CHARSET']." ALL $search_string";
} else {
- $ss .= "SEARCH ALL $search_string\"";
+ $ss = "SEARCH ALL $search_string";
}
- /* Read Data Back From IMAP */
- $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
+ /* read data back from IMAP */
+ $readin = sqimap_run_command($imapConnection, $ss, true, $result, $message);
+
+ /* try US-ASCII charset if search fails */
if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {
- // $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"";
$ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_string";
$readin = sqimap_run_command ($imapConnection, $ss, 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++;
+ 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));
+ } 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")) {
- if ($search_all != "all") {
- echo '