X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmove_messages.php;h=c47024447798924575cd03e8acc913bbd8056830;hb=7e4850ff5cbe4ed0c681b8a64e0741d0a95b2f63;hp=9829f0c4e8ededc4648c8b51ce672e132f88a94c;hpb=08185f2a7631c3a12cb1ac085fec3be471b56b00;p=squirrelmail.git diff --git a/src/move_messages.php b/src/move_messages.php index 9829f0c4..c4702444 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -3,7 +3,7 @@ /** * 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. @@ -16,12 +16,18 @@ define('SM_PATH','../'); /* 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 ( !sqgetGlobalVar('composesession', $composesession, SQ_SESSION) ) { + $composesession = 0; +} + +/* obsolete ?? */ function putSelectedMessagesIntoString($msg) { $j = 0; $i = 0; @@ -44,39 +50,26 @@ function putSelectedMessagesIntoString($msg) { } function attachSelectedMessages($msg, $imapConnection) { - global $mailbox, $username, $attachment_dir, $attachments, $identity, - $data_dir, $composesession, $lastTargetMailbox, $uid_support, - $msgs, $startMessage, $show_num, $thread_sort_messages, - $allow_server_sort; - - if (!isset($attachments)) { - $attachments = array(); - session_register('attachments'); + global $username, $attachment_dir, + $data_dir, $composesession, $uid_support, + $msgs, $thread_sort_messages, $allow_server_sort, $show_num, + $compose_messages; + + if (!isset($compose_messages)) { + $compose_messages = array(); + sqsession_register($compose_messages,'compose_messages'); } - if (!isset($composesession) ) { + if (!$composesession) { $composesession = 1; - session_register('composesession'); + sqsession_register($composesession,'composesession'); } else { $composesession++; + sqsession_register($composesession,'composesession'); } $hashed_attachment_dir = getHashedDir($username, $attachment_dir, $composesession); - $rem_attachments = array(); - foreach ($attachments as $info) { - if ($info['session'] == $composesession) { - $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - if (file_exists($attached_file)) { - unlink($attached_file); - } - } else { - $rem_attachments[] = $info; - } - } - - $attachments = $rem_attachments; - if ($thread_sort_messages || $allow_server_sort) { $start_index=0; } else { @@ -86,6 +79,12 @@ function attachSelectedMessages($msg, $imapConnection) { $i = 0; $j = 0; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + + $composeMessage = new Message(); + $rfc822_header = new Rfc822Header(); + $composeMessage->rfc822_header = $rfc822_header; + $composeMessage->reply_rfc822_header = ''; + while ($j < count($msg)) { if (isset($msg[$i])) { $id = $msg[$i]; @@ -104,29 +103,54 @@ function attachSelectedMessages($msg, $imapConnection) { $fp = fopen( $full_localfilename, 'wb'); fwrite ($fp, $body); fclose($fp); - $newAttachment = array(); - $newAttachment['localfilename'] = $localfilename; - $newAttachment['type'] = "message/rfc822"; - $newAttachment['remotefilename'] = $subject.'.eml'; - $newAttachment['session'] = $composesession; - $attachments[] = $newAttachment; - flush(); + $composeMessage->initAttachment('message/rfc822',$subject.'.eml', + $full_localfilename); } $j++; } $i++; } - setPref($data_dir, $username, 'attachments', serialize($attachments)); + $compose_messages[$composesession] = $composeMessage; + sqsession_register($compose_messages,'compose_messages'); + session_write_close(); return $composesession; } -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -sqimap_mailbox_select($imapConnection, $mailbox); -$location = set_url_var($location,'composenew'); -$location = set_url_var($location,'composesession'); -$location = set_url_var($location,'session'); +/* 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); + +sqgetGlobalVar('mailbox', $mailbox); +sqgetGlobalVar('startMessage', $startMessage); +sqgetGlobalVar('msg', $msg); + +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); + +/* end of get globals */ + +$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$mbx_response=sqimap_mailbox_select($imapConnection, $mailbox); + +$location = set_url_var($location,'composenew',0,false); +$location = set_url_var($location,'composesession',0,false); +$location = set_url_var($location,'session',0,false); /* remember changes to mailbox setting */ if (!isset($lastTargetMailbox)) { @@ -134,103 +158,129 @@ if (!isset($lastTargetMailbox)) { } if ($targetMailbox != $lastTargetMailbox) { $lastTargetMailbox = $targetMailbox; - session_register('lastTargetMailbox'); + sqsession_register($lastTargetMailbox, 'lastTargetMailbox'); } - +$exception = false; // expunge-on-demand if user isn't using move_to_trash or auto_expunge if(isset($expungeButton)) { - sqimap_mailbox_expunge($imapConnection, $mailbox, true); - header("Location: $location"); + $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true); + if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) { + if ($startMessage > $show_num) { + $location = set_url_var($location,'startMessage',$startMessage-$show_num,false); + } else { + $location = set_url_var($location,'startMessage',1,false); + } + } } elseif(isset($undeleteButton)) { // 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++; } - header ("Location: $location"); + if (count($id)) { + sqimap_toggle_flag($imapConnection, $id, '\\Deleted',false,true); + } } else { - displayPageHeader($color, $mailbox); - error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); + $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) { - sqimap_mailbox_expunge($imapConnection, $mailbox, true); + 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); if ($compose_new_win) { - header ("Location: $location&composenew=1&session=$composesession"); + $location = set_url_var($location, 'composenew', 1, false); } else { $location = str_replace('search.php','compose.php',$location); $location = str_replace('right_main.php','compose.php',$location); - header ("Location: $location&session=$composesession"); } } else { - header ("Location: $location"); + if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) { + if ($startMessage > $show_num) { + $location = set_url_var($location,'startMessage',$startMessage-$show_num, false); + } else { + $location = set_url_var($location,'startMessage',1, false); + } + } } } else { - displayPageHeader($color, $mailbox); - error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); + $exception = true; } } 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. - while ($j < count($msg)) { + $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) { - sqimap_mailbox_expunge($imapConnection, $mailbox, true); + $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true); + } else { + $cnt = 0; + } + + if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) { + if ($startMessage > $show_num) { + $location = set_url_var($location,'startMessage',$startMessage-$show_num, false); + } else { + $location = set_url_var($location,'startMessage',1, false); + } } - header ("Location: $location"); } else { - displayPageHeader($color, $mailbox); - error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); + $exception = true; } } // Log out this session sqimap_logout($imapConnection); - +if ($exception) { + displayPageHeader($color, $mailbox); + error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); +} else { + header("Location: $location"); + exit; +} ?>