X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=c5f4c837d9bc53913160a24f89604c368755d9df;hb=8061a3fb7663a4e8edf2f415e5547fc81bcdbcb6;hp=1edfa827d45383189c91bf501c21335140121b67;hpb=e2370222dc6e0e9ec897575778ec5eec6c337ade;p=squirrelmail.git
diff --git a/src/move_messages.php b/src/move_messages.php
index 1edfa827..c5f4c837 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -1,20 +1,27 @@
-
-";
- deleteMessages($imapConnection, $msg[$i], $msg[$i], $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox);
+ if (isset($msg[$i])) {
+ sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
$j++;
}
$i++;
}
- messages_deleted_message($mailbox, $sort, $startMessage);
+ 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 {
- echo "
No messages selected.";
+ 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;
@@ -67,26 +113,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);
?>