X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=8b7b7cf802770ac1c1c61041ed2fdf131a90f3ac;hb=6b6381715922c24dc8664cc62464096814d6a291;hp=59b57fc9e7d357200c8453320e5e14e8df645941;hpb=5917742752bea11a547aeba6e4102dd3655b4800;p=squirrelmail.git diff --git a/src/move_messages.php b/src/move_messages.php index 59b57fc9..8b7b7cf8 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -1,4 +1,13 @@ \n"; - function putSelectedMessagesIntoString($msg) { $j = 0; $i = 0; @@ -44,7 +51,6 @@ // If the delete button was pressed, the moveButton variable will not be set. if (!$moveButton) { - // displayPageHeader($color, $mailbox); if (is_array($msg) == 1) { // Marks the selected messages ad 'Deleted' $j = 0; @@ -59,23 +65,19 @@ } $i++; } - if ($auto_expunge) + if ($auto_expunge) { sqimap_mailbox_expunge($imapConnection, $mailbox); - - if ($auto_forward) { - header ("Location: right_main.php?PHPSESSID=$PHPSESSID"); - } else { - echo "\n"; - displayPageHeader($color, $mailbox); - messages_deleted_message($mailbox, $sort, $startMessage, $color); } + $location = get_location(); + 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 { - echo "\n"; displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); } } else { // Move messages -// displayPageHeader($color, $mailbox); // lets check to see if they selected any messages if (is_array($msg) == 1) { $j = 0; @@ -95,15 +97,12 @@ if ($auto_expunge == true) sqimap_mailbox_expunge($imapConnection, $mailbox); - if ($auto_forward) { - header ("Location: right_main.php?PHPSESSID=$PHPSESSID"); - } else { - echo "\n"; - displayPageHeader($color, $mailbox); - messages_moved_message($mailbox, $sort, $startMessage, $color); - } + $location = get_location(); + 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 { - echo "\n"; displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); }