X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmove_messages.php;h=027fbc0cee232e01234e647a29190ca11029481c;hb=24d1619523e7005477feb74d9a54da6a0efc58a6;hp=5852a8eb6ab96332267748a943af27e2872e1bc8;hpb=213b188d9bb7e380b10b51fd900430dca8ec1f78;p=squirrelmail.git
diff --git a/src/move_messages.php b/src/move_messages.php
index 5852a8eb..027fbc0c 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -1,95 +1,231 @@
-
-";
- }
-
- function putSelectedMessagesIntoString($msg) {
- $j = 0;
- $i = 0;
- $firstLoop = true;
-
- // 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)) && ($msg[0])) {
- if ($msg[$i]) {
- if ($firstLoop != true)
- $selectedMessages .= "&";
- else
- $firstLoop = false;
+
No messages selected.";
- }
- } else { // Move messages
- displayPageHeader($mailbox);
- // lets check to see if they selected any messages
- if (is_array($msg) == 1) {
- $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 ($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");
- $j++;
+ }
+ header ("Location: $location");
+ } else {
+ displayPageHeader($color, $mailbox);
+ error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+ }
+} elseif (!isset($moveButton)) {
+ // If the delete button was pressed, the moveButton variable will not be set.
+ 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", true);
+ } else if (isset($markUnread)) {
+ sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
+ } else if (isset($attache)) {
+ break;
+ } else {
+ sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
+ }
+ $j++;
+ }
+ $i++;
+ }
+ if ($auto_expunge) {
+ sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+ }
+ if (isset($attache)) {
+ $composesession = attachSelectedMessages($msg, $imapConnection);
+ if ($compose_new_win) {
+ header ("Location: $location&composenew=1&session=$composesession");
+ } else {
+ $location = str_replace('search.php','compose.php',$location);
+ $location = str_replace('right_main.php','compose.php',$location);
+ header ("Location: $location&session=$composesession");
+ }
+ } else {
+ header ("Location: $location");
+ }
+ } else {
+ displayPageHeader($color, $mailbox);
+ error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+ }
+} else { // Move messages
+ // lets check to see if they selected any messages
+ if (is_array($msg) == 1) {
+ $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])) {
+ /** check if they would like to move it to the trash folder or not */
+ sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox);
+ sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted", true);
+ $j++;
}
$i++;
- }
- if ($auto_expunge == true)
- expungeBox($imapConnection, $mailbox, $numMessages);
-
- messages_moved_message($mailbox, $sort, $startMessage);
- } else {
- error_message("No messages were selected.", $mailbox, $sort, $startMessage);
- }
- }
-
- // Log out this session
- fputs($imapConnection, "1 logout");
+ }
+ if ($auto_expunge) {
+ sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+ }
+ header ("Location: $location");
+ } else {
+ displayPageHeader($color, $mailbox);
+ error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
+ }
+}
+// Log out this session
+sqimap_logout($imapConnection);
?>