X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=fbc9baeb551345657dbc1f549faa7eeff5750bbe;hb=cb850f18ebe1712284fdd77dbad78f4e0c059193;hp=86e6f2bd43e36ba3e383f624051240393ef2fa8f;hpb=0f8a1ce94ff62c4a6022969cf2b3e8fb695282f4;p=squirrelmail.git
diff --git a/functions/imap_search.php b/functions/imap_search.php
index 86e6f2bd..fbc9baeb 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -17,7 +17,7 @@ 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;
@@ -38,7 +38,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
}
else {
$search_string = '';
- $count = count($multi_search);
+ $count = count($multi_search);
for ($x=0;$x<$count;$x++) {
$search_string = $search_string . ' ' . $search_where . " " . '"' . $multi_search[$x] . '" ';
}
@@ -79,9 +79,18 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
/* If nothing is found * SEARCH should be the first error else echo errors */
if (isset($errors) && strstr($errors,"* SEARCH")) {
+ if ($search_all != "all") {
echo '