X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=8b7b7cf802770ac1c1c61041ed2fdf131a90f3ac;hb=6b6381715922c24dc8664cc62464096814d6a291;hp=13cfcfa69b21f4f250a66afecb4c21ed7fb9e2f1;hpb=dd88d31f69c41238a0adb6ba699d4ae1e043dfb0;p=squirrelmail.git
diff --git a/src/move_messages.php b/src/move_messages.php
index 13cfcfa6..8b7b7cf8 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -1,19 +1,36 @@
-
-
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;
@@ -77,25 +88,28 @@
while ($j < count($msg)) {
if ($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);
-
- echo "Messages are moved.
";
+ sqimap_mailbox_expunge($imapConnection, $mailbox);
+
+ $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
\n";
- echo "No messages selected.\n";
+ displayPageHeader($color, $mailbox);
+ error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
}
}
// Log out this session
- fputs($imapConnection, "1 logout");
+ sqimap_logout($imapConnection);
?>