X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=fb46544b8395658b359397785fa54c5a0fb43b5a;hb=092d4f2c0928f0da88c66dc0ac20e6256dcdb076;hp=33967ba42c639dddbe3f619c511e751606cf777e;hpb=8b673ac145ad6dc77796fc0c1ef48094c76b46e1;p=squirrelmail.git diff --git a/src/move_messages.php b/src/move_messages.php index 33967ba4..fb46544b 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -1,21 +1,44 @@ -\n"; +/*****************************************************************/ +/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ +/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ +/*** + Base level indent should begin at left margin, as ***/ +/*** the require_once below looks. ***/ +/*** + All identation should consist of four space blocks ***/ +/*** + Tab characters are evil. ***/ +/*** + all comments should use "slash-star ... star-slash" ***/ +/*** style -- no pound characters, no slash-slash style ***/ +/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ +/*** ALWAYS USE { AND } CHARACTERS!!! ***/ +/*** + Please use ' instead of ", when possible. Note " ***/ +/*** should always be used in _( ) function calls. ***/ +/*** Thank you for your help making the SM code more readable. ***/ +/*****************************************************************/ + +require_once('../src/validate.php'); +require_once('../functions/display_messages.php'); +require_once('../functions/imap.php'); 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. + // 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) @@ -31,14 +54,22 @@ } } - $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0); + $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) { - displayPageHeader($color, $mailbox); + // 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; @@ -46,18 +77,57 @@ // 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] . "
"; - sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox); + sqimap_messages_remove_flag ($imapConnection, $msg[$i], $msg[$i], "Deleted"); + $j++; + } + $i++; + } + $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++; } - 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 { + displayPageHeader($color, $mailbox); 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; @@ -66,8 +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]) { - echo $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"); @@ -76,10 +145,15 @@ $i++; } if ($auto_expunge == true) - sqimap_mailbox_expunge($imapConnection, $mailbox, $numMessages); + sqimap_mailbox_expunge($imapConnection, $mailbox, true); - 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 { + displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); } }