X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fmove_messages.php;h=d23bf5f91dfdfae069eed729d4c00d311ddf1606;hp=280a2399589b19f9766f2adc68dcf136fad2fa14;hb=434666c7ad8b67074d0f57fe8c45ecf8481f40c1;hpb=d92b6f319c3ca67ff701db9da869b42c298ef9a4 diff --git a/src/move_messages.php b/src/move_messages.php index 280a2399..d23bf5f9 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -1,20 +1,38 @@ - - include("../config/config.php"); - include("../functions/mailbox.php"); - include("../functions/strings.php"); - include("../functions/page_header.php"); - include("../functions/display_messages.php"); - include("../functions/imap.php"); +
\n"; + session_start(); + + if (!isset($strings_php)) + include("../functions/strings.php"); + if (!isset($config_php)) + include("../config/config.php"); + if (!isset($page_header_php)) + include("../functions/page_header.php"); + if (!isset($display_messages_php)) + include("../functions/display_messages.php"); + if (!isset($imap_php)) + include("../functions/imap.php"); + + include("../src/load_prefs.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) @@ -30,14 +48,47 @@ } } - $imapConnection = loginToImapServer($username, $key, $imapServerAddress); + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + sqimap_mailbox_select($imapConnection, $mailbox); - // switch to the mailbox, and get the number of messages in it. - selectMailbox($imapConnection, $mailbox, $numMessages, $imapServerAddress); + // 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) { + // Removes \Deleted flag from selected messages + $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]) { + 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. - if (!$moveButton) { - displayPageHeader($color, $mailbox); + elseif (!isset($moveButton)) { if (is_array($msg) == 1) { // Marks the selected messages ad 'Deleted' $j = 0; @@ -47,18 +98,24 @@ // 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: $msg[$i]