X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fmove_messages.php;h=fb46544b8395658b359397785fa54c5a0fb43b5a;hp=a4c85d96126fe9f15bf468833d7ada6b29eda26a;hb=15e6162eacc97158393bc75aed3afeb7b19c24a6;hpb=acaa98429a77e9bcaab8eb86ec04f3247729c0a5 diff --git a/src/move_messages.php b/src/move_messages.php index a4c85d96..fb46544b 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -1,20 +1,35 @@ \n"; +require_once('../src/validate.php'); +require_once('../functions/display_messages.php'); +require_once('../functions/imap.php'); function putSelectedMessagesIntoString($msg) { $j = 0; @@ -42,10 +57,19 @@ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); - // If the delete button was pressed, the moveButton variable will not be set. - if (!$moveButton) { + // expunge-on-demand if user isn't using move_to_trash or auto_expunge + if(isset($expungeButton)) { + sqimap_mailbox_expunge($imapConnection, $mailbox, true); + $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)); + } + // undelete messages if user isn't using move_to_trash or auto_expunge + elseif(isset($undeleteButton)) { if (is_array($msg) == 1) { - // Marks the selected messages ad 'Deleted' + // Removes \Deleted flag from selected messages $j = 0; $i = 0; @@ -53,23 +77,53 @@ // 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]) { - sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox); + sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted"); $j++; } $i++; } - if ($auto_expunge) { - 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 { + 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_forward) { - header ("Location: right_main.php"); - } else { - echo "\n"; - displayPageHeader($color, $mailbox); - messages_deleted_message($mailbox, $sort, $startMessage, $color); + 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 "\n"; displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); } @@ -82,7 +136,7 @@ // 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 */ sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox); sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted"); @@ -91,17 +145,14 @@ $i++; } if ($auto_expunge == true) - sqimap_mailbox_expunge($imapConnection, $mailbox); + sqimap_mailbox_expunge($imapConnection, $mailbox, true); - if ($auto_forward) { - header ("Location: right_main.php"); - } else { - echo "\n"; - displayPageHeader($color, $mailbox); - messages_moved_message($mailbox, $sort, $startMessage, $color); - } + $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 "\n"; displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); }