X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=74320bf3874683c69a2ac4137c968ba94d2201b6;hb=46bb8da8de53e495aebabac0150e2f9a491aceae;hp=33967ba42c639dddbe3f619c511e751606cf777e;hpb=8b673ac145ad6dc77796fc0c1ef48094c76b46e1;p=squirrelmail.git diff --git a/src/move_messages.php b/src/move_messages.php index 33967ba4..74320bf3 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -1,91 +1,151 @@ -\n"; - - 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]) { +"; - sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox); - $j++; + sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted"); + $j++; } $i++; - } - messages_deleted_message($mailbox, $sort, $startMessage, $color); - } else { - 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; - $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]) { - echo $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"); - $j++; + } + $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 { + 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"); + } 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 == true) - sqimap_mailbox_expunge($imapConnection, $mailbox, $numMessages); - - messages_moved_message($mailbox, $sort, $startMessage, $color); - } else { - error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); - } - } - - // Log out this session - sqimap_logout($imapConnection); + } + 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 + // 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"); + $j++; + } + $i++; + } + if ($auto_expunge == true) + 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); + } +} + +// Log out this session +sqimap_logout($imapConnection); ?>