X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=fbc9baeb551345657dbc1f549faa7eeff5750bbe;hb=e5f1d1ee9a85d2a271135d05f6d1300996e48aa8;hp=e1cc1de2739d80563af70621c2acced5b1f7e998;hpb=29eb54865a68627bd3dc4934103a1a38f8db4678;p=squirrelmail.git
diff --git a/functions/imap_search.php b/functions/imap_search.php
index e1cc1de2..fbc9baeb 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,14 +1,14 @@
' . _("No Messages Found") . '';
return;
- } else if (isset($errors)) {
+ }
+ else {
+ return;
+ }
+ }
+// else if ($search_all == 'all') {
+// return;
+// }
+ else if (isset($errors)) {
echo "";
}
@@ -90,7 +119,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
$j = 0;
while ($j < count($messagelist)) {
- $date[$j] = ereg_replace(' ', ' ', $date[$j]);
+ $date[$j] = str_replace(' ', ' ', $date[$j]);
$tmpdate = explode(" ", trim($date[$j]));
$messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate);
@@ -141,22 +170,40 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
if (count($messagelist) > 0) {
$j=0;
- if (!isset ($msg)) { $msg = ""; }
-
- mail_message_listing_beginning( $imapConnection,
- "move_messages.php?msg=$msg&mailbox=$urlMailbox&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
- $mailbox,
- -1,
- '' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '',
- get_selectall_link($start_msg, $sort) );
-
-
+ if (!isset ($msg)) {
+ $msg = '';
+ }
+ if ($search_all != 'all') {
+ if ( !isset( $start_msg ) ) {
+ $start_msg =0;
+ }
+ if ( !isset( $sort ) ) {
+ $sort = 0;
+ }
+ mail_message_listing_beginning( $imapConnection,
+ "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
+ $mailbox,
+ -1,
+ '' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . ''.
+ get_selectall_link($start_msg, $sort));
+ }
+ else {
+ mail_message_listing_beginning( $imapConnection,
+ "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
+ $mailbox,
+ -1,
+ '' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '
');
+ }
+ echo "$mailbox";
while ($j < count($msgs)) {
printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what);
$j++;
+ echo '
';
}
- echo '';
+ echo '';
+ $count_all = count($msgs);
}
+ return $count_all;
}
-?>
\ No newline at end of file
+?>