X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=8b6a5f543e6d829e4dc15b24480ae77f7754c8f6;hb=c95df3808257297105d60595ab869357359a89e7;hp=33967ba42c639dddbe3f619c511e751606cf777e;hpb=8b673ac145ad6dc77796fc0c1ef48094c76b46e1;p=squirrelmail.git
diff --git a/src/move_messages.php b/src/move_messages.php
index 33967ba4..8b6a5f54 100644
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -1,21 +1,36 @@
-
- include("../config/config.php");
- include("../functions/strings.php");
- include("../functions/page_header.php");
- include("../functions/display_messages.php");
- include("../functions/imap.php");
+
\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,11 @@
}
}
- $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);
if (is_array($msg) == 1) {
// Marks the selected messages ad 'Deleted'
$j = 0;
@@ -46,18 +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]) {
- echo $msg[$i] . "
";
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;
@@ -67,7 +87,6 @@
// 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] . "
";
/** 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,15 +95,21 @@
$i++;
}
if ($auto_expunge == true)
- sqimap_mailbox_expunge($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
+ sqimap_mailbox_close($imapConnection);
sqimap_logout($imapConnection);
?>