X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=ae7155c4bcb526524734b4275d5457a41796810e;hb=ca29b81004eea3cff3f249e95235ba544730a4e7;hp=da8d6707b87e3dbeb267cafdb9206148d166ca76;hpb=813eba2f5f4695bd30b895cd148658f3b90bf120;p=squirrelmail.git diff --git a/src/move_messages.php b/src/move_messages.php index da8d6707..ae7155c4 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -1,21 +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) @@ -31,12 +46,47 @@ } } - $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0); + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); + // expunge-on-demand if user isn't using move_to_trash or auto_expunge + if($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($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 (!$moveButton) { if (is_array($msg) == 1) { // Marks the selected messages ad 'Deleted' $j = 0; @@ -51,12 +101,19 @@ } $i++; } - messages_deleted_message($mailbox, $sort, $startMessage, $color); + if ($auto_expunge) { + 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)); } 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; @@ -67,23 +124,28 @@ while ($j < count($msg)) { if ($msg[$i]) { /** check if they would like to move it to the trash folder or not */ - $success = sqimap_messages_copy($imapConnection, $msg[$i], $msg[$i], $targetMailbox); - if ($success == true) - sqimap_messages_flag($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) - sqimap_mailbox_expunge($imapConnection, $mailbox, $numMessages); + sqimap_mailbox_expunge($imapConnection, $mailbox, true); - 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 + sqimap_mailbox_close($imapConnection); sqimap_logout($imapConnection); ?>