X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=fb46544b8395658b359397785fa54c5a0fb43b5a;hb=092d4f2c0928f0da88c66dc0ac20e6256dcdb076;hp=36e966b17b1a132b68a58a68e1818b068b0080d3;hpb=de80e95e61d4a179a0d41ac4512c83818f3243ef;p=squirrelmail.git
diff --git a/src/move_messages.php b/src/move_messages.php
index 36e966b1..fb46544b 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -1,19 +1,44 @@
-
-
No messages selected.";
+ displayPageHeader($color, $mailbox);
+ error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+ }
+ }
+ // If the delete button was pressed, the moveButton variable will not be set.
+ elseif (!isset($moveButton)) {
+ if (is_array($msg) == 1) {
+ // Marks the selected messages as 'Deleted'
+ $j = 0;
+ $i = 0;
+
+ // If they have selected nothing msg is size one still, but will be an infinite
+ // loop because we never increment j. so check to see if msg[0] is set or not to fix this.
+ while ($j < count($msg)) {
+ if (isset($msg[$i])) {
+ if (isset($markRead)) {
+ sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+ } else if (isset($markUnread)) {
+ sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen");
+ } else {
+ sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+ }
+ $j++;
+ }
+ $i++;
+ }
+ if ($auto_expunge) {
+ sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+ }
+ $location = get_location();
+ if (isset($where) && isset($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);
}
} else { // Move messages
- displayPageHeader($mailbox);
// lets check to see if they selected any messages
if (is_array($msg) == 1) {
$j = 0;
@@ -66,26 +136,30 @@
// If they have selected nothing msg is size one still, but will be an infinite
// loop because we never increment j. so check to see if msg[0] is set or not to fix this.
while ($j < count($msg)) {
- if ($msg[$i]) {
+ if (isset($msg[$i])) {
/** check if they would like to move it to the trash folder or not */
- $success = copyMessages($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
- if ($success == true)
- setMessageFlag($imapConnection, $msg[$i], $msg[$i], "Deleted");
+ sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
+ sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted");
$j++;
}
$i++;
}
if ($auto_expunge == true)
- expungeBox($imapConnection, $mailbox, $numMessages);
+ sqimap_mailbox_expunge($imapConnection, $mailbox, true);
- messages_moved_message($mailbox, $sort, $startMessage);
+ $location = get_location();
+ if (isset($where) && isset($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 {
- error_message("No messages were selected.", $mailbox, $sort, $startMessage);
+ displayPageHeader($color, $mailbox);
+ error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
}
}
// Log out this session
- fputs($imapConnection, "1 logout");
+ sqimap_logout($imapConnection);
?>