}
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) ) {
$composesession = 1;
- session_register('composesession');
+ sqsession_register($composesession,'composesession');
} else {
$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 {
$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];
$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');
return $composesession;
}
+
+
+/* get globals */
+
+$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'];
+}
+
+if (isset($_SESSION['msgs'])) {
+ $msgs = $_SESSION['msgs'];
+}
+
+
+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);
-sqimap_mailbox_select($imapConnection, $mailbox);
+$mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
$location = set_url_var($location,'composenew');
$location = set_url_var($location,'composesession');
$location = set_url_var($location,'session');
-
/* remember changes to mailbox setting */
if (!isset($lastTargetMailbox)) {
$lastTargetMailbox = 'INBOX';
}
if ($targetMailbox != $lastTargetMailbox) {
$lastTargetMailbox = $targetMailbox;
- session_register('lastTargetMailbox');
+ sqsession_register($lastTargetMailbox, 'lastTargetMailbox');
}
// expunge-on-demand if user isn't using move_to_trash or auto_expunge
if(isset($expungeButton)) {
- sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+ $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);
+ } else {
+ $location = set_url_var($location,'startMessage',1);
+ }
+ }
header("Location: $location");
+ exit;
} 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++;
}
header ("Location: $location");
+ exit;
} else {
displayPageHeader($color, $mailbox);
error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
$i++;
}
if ($auto_expunge) {
- sqimap_mailbox_expunge($imapConnection, $mailbox, true);
- }
+ $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+ } else {
+ $cnt = 0;
+ }
if (isset($attache)) {
$composesession = attachSelectedMessages($msg, $imapConnection);
if ($compose_new_win) {
header ("Location: $location&composenew=1&session=$composesession");
+ exit;
} else {
$location = str_replace('search.php','compose.php',$location);
$location = str_replace('right_main.php','compose.php',$location);
header ("Location: $location&session=$composesession");
+ exit;
}
} else {
+ if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
+ if ($startMessage > $show_num) {
+ $location = set_url_var($location,'startMessage',$startMessage-$show_num);
+ } else {
+ $location = set_url_var($location,'startMessage',1);
+ }
+ }
header ("Location: $location");
+ exit;
}
} else {
displayPageHeader($color, $mailbox);
$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)) {
+ $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);
$i++;
}
if ($auto_expunge) {
- sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+ $cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+ } else {
+ $cnt = 0;
}
- header ("Location: $location");
+
+ if (($startMessage+$cnt-1) >= $mbx_response['EXISTS']) {
+ if ($startMessage > $show_num) {
+ $location = set_url_var($location,'startMessage',$startMessage-$show_num);
+ } else {
+ $location = set_url_var($location,'startMessage',1);
+ }
+ }
+ header ("Location: $location");
+ exit;
} else {
displayPageHeader($color, $mailbox);
error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color);
}
// Log out this session
sqimap_logout($imapConnection);
-
?>
</BODY></HTML>
projects / squirrelmail.git / blobdiff