X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=8b7b7cf802770ac1c1c61041ed2fdf131a90f3ac;hb=6b6381715922c24dc8664cc62464096814d6a291;hp=3281867be4f4a5c0cb13e239a8cc6612c11d9474;hpb=1195c34026fc65eb8e0ca7a337fe4b406764dee8;p=squirrelmail.git diff --git a/src/move_messages.php b/src/move_messages.php index 3281867b..8b7b7cf8 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -69,7 +69,10 @@ sqimap_mailbox_expunge($imapConnection, $mailbox); } $location = get_location(); - header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); + if ($where && $what) + header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); + else + header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); } else { displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); @@ -95,7 +98,10 @@ sqimap_mailbox_expunge($imapConnection, $mailbox); $location = get_location(); - header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); + if ($where && $what) + header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)); + else + header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=". urlencode($mailbox)); } else { displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);