X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=8b7b7cf802770ac1c1c61041ed2fdf131a90f3ac;hb=6b6381715922c24dc8664cc62464096814d6a291;hp=1ca5788812c383d07fc2c5358d47ecd253def330;hpb=b235d62915dba943446744b725971bd2c47bc347;p=squirrelmail.git diff --git a/src/move_messages.php b/src/move_messages.php index 1ca57888..8b7b7cf8 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -1,22 +1,36 @@ -\n"; + 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) @@ -32,14 +46,11 @@ } } - $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0); - - // switch to the mailbox, and get the number of messages in it. - selectMailbox($imapConnection, $mailbox, $numMessages, $imapServerAddress); + $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); if (is_array($msg) == 1) { // Marks the selected messages ad 'Deleted' $j = 0; @@ -49,17 +60,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]) { - deleteMessages($imapConnection, $msg[$i], $msg[$i], $numMessages, $trash_folder, $move_to_trash, $auto_expunge, $mailbox); + 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); + } + $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); } } else { // Move messages - displayPageHeader($color, $mailbox); // lets check to see if they selected any messages if (is_array($msg) == 1) { $j = 0; @@ -70,24 +88,28 @@ 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"); + sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox); + sqimap_messages_flag($imapConnection, $msg[$i], $msg[$i], "Deleted"); $j++; } $i++; } if ($auto_expunge == true) - expungeBox($imapConnection, $mailbox, $numMessages); + sqimap_mailbox_expunge($imapConnection, $mailbox); - messages_moved_message($mailbox, $sort, $startMessage, $color); + $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); } } // Log out this session - fputs($imapConnection, "1 logout"); + sqimap_logout($imapConnection); ?>