/**
* move_messages.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Enables message moving between folders on the IMAP server.
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'functions/imap.php');
require_once(SM_PATH . 'functions/html.php');
global $compose_new_win;
-if (isset($_SESSION['composesession'])) {
- $composesession = $_SESSION['composesession'];
-} else {
- $composesession = 0;
-}
+if ( !sqgetGlobalVar('composesession', $composesession, SQ_SESSION) ) {
+ $composesession = 0;
+}
+/* obsolete ?? */
function putSelectedMessagesIntoString($msg) {
$j = 0;
$i = 0;
$msgs, $thread_sort_messages, $allow_server_sort, $show_num,
$compose_messages;
-
if (!isset($compose_messages)) {
$compose_messages = array();
sqsession_register($compose_messages,'compose_messages');
/* get globals */
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$onetimepad = $_SESSION['onetimepad'];
-$base_uri = $_SESSION['base_uri'];
-$delimiter = $_SESSION['delimiter'];
-if (isset($_GET['mailbox'])) {
- $mailbox = $_GET['mailbox'];
-}
-if (isset($_GET['startMessage'])) {
- $startMessage = $_GET['startMessage'];
-}
-if (isset($_POST['moveButton'])) {
- $moveButton = $_POST['moveButton'];
-}
-if (isset($_POST['msg'])) {
- $msg = $_POST['msg'];
-}
-elseif (isset($_GET['msg'])) {
- $msg = $_GET['msg'];
-}
+sqgetGlobalVar('mailbox', $mailbox);
+sqgetGlobalVar('startMessage', $startMessage);
+sqgetGlobalVar('msg', $msg);
-if (isset($_SESSION['msgs'])) {
- $msgs = $_SESSION['msgs'];
-}
+sqgetGlobalVar('msgs', $msgs, SQ_SESSION);
+sqgetGlobalVar('composesession', $composesession, SQ_SESSION);
+sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION);
+sqgetGlobalVar('moveButton', $moveButton, SQ_POST);
+sqgetGlobalVar('expungeButton', $expungeButton, SQ_POST);
+sqgetGlobalVar('targetMailbox', $targetMailbox, SQ_POST);
+sqgetGlobalVar('expungeButton', $expungeButton, SQ_POST);
+sqgetGlobalVar('undeleteButton', $undeleteButton, SQ_POST);
+sqgetGlobalVar('markRead', $markRead, SQ_POST);
+sqgetGlobalVar('markUnread', $markUnread, SQ_POST);
+sqgetGlobalVar('attache', $attache, SQ_POST);
+sqgetGlobalVar('location', $location, SQ_POST);
-if (isset($_POST['expungeButton'])) {
- $expungeButton = $_POST['expungeButton'];
-}
-if (isset($_POST['targetMailbox'])) {
- $targetMailbox = $_POST['targetMailbox'];
-}
-if (isset($_SESSION['lastTargetMailbox'])) {
- $lastTargetMailbox = $_SESSION['lastTargetMailbox'];
-}
-if (isset($_POST['expungeButton'])) {
- $expungeButton = $_POST['expungeButton'];
-}
-if (isset($_POST['undeleteButton'])) {
- $undeleteButton = $_POST['undeleteButton'];
-}
-if (isset($_POST['markRead'])) {
- $markRead = $_POST['markRead'];
-}
-if (isset($_POST['markUnread'])) {
- $markUnread = $_POST['markUnread'];
-}
-if (isset($_POST['attache'])) {
- $attache = $_POST['attache'];
-}
-
-if (isset($_POST['location'])) {
- $location = $_POST['location'];
-}
-
-if (isset($_SESSION['composesession'])) {
- $composesession = $_SESSION['composesession'];
-}
/* end of get globals */
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
// undelete messages if user isn't using move_to_trash or auto_expunge
if (is_array($msg) == 1) {
// Removes \Deleted flag from selected messages
- $j = 0;
- $i = 0;
+ $j = $i = 0;
+ $id = array();
// 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", true);
+ $id[] = $msg[$i];
$j++;
}
$i++;
}
+ if (count($id)) {
+ sqimap_toggle_flag($imapConnection, $id, '\\Deleted',false,true);
+ }
} else {
$exception = true;
}
} elseif (!isset($moveButton)) {
// If the delete button was pressed, the moveButton variable will not be set.
- if (is_array($msg) == 1) {
+ if (is_array($msg)) {
// Marks the selected messages as 'Deleted'
- $j = 0;
- $i = 0;
+ $j = $i = $cnt = 0;
+ $id = array();
// 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", true);
- } else if (isset($markUnread)) {
- sqimap_messages_remove_flag($imapConnection, $msg[$i], $msg[$i], "Seen", true);
- } else if (isset($attache)) {
- break;
- } else {
- sqimap_messages_delete($imapConnection, $msg[$i], $msg[$i], $mailbox);
- }
+ $id[] = $msg[$i];
$j++;
}
$i++;
}
- if ($auto_expunge) {
- $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
- } else {
- $cnt = 0;
- }
+ if (count($id) && !isset($attache)) {
+ if (isset($markRead)) {
+ sqimap_toggle_flag($imapConnection, $id, '\\Seen',true,true);
+ } else if (isset($markUnread)) {
+ sqimap_toggle_flag($imapConnection, $id, '\\Seen',false,true);
+ } else {
+ sqimap_msgs_list_delete($imapConnection, $mailbox, $id);
+ if ($auto_expunge) {
+ $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+ }
+ }
+ }
if (isset($attache)) {
$composesession = attachSelectedMessages($msg, $imapConnection);
$location = set_url_var($location, 'session', $composesession, false);
}
} else { // Move messages
// lets check to see if they selected any messages
- if (is_array($msg) == 1) {
- $j = 0;
- $i = 0;
+ if (is_array($msg)) {
+ $j = $i = 0;
+ $id = array();
// 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.
$cnt = count($msg);
while ($j < $cnt) {
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", true);
+ $id[] = $msg[$i];
$j++;
}
$i++;
}
+ sqimap_msgs_list_copy($imapConnection,$id,$targetMailbox);
if ($auto_expunge) {
$cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
} else {
projects / squirrelmail.git / blobdiff