From cd219a45dd64d7d6916656e5e1b3a4ead68974c2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 18 Dec 2015 05:42:05 -0500
Subject: [PATCH] Fix regression where some message attachments could be missing on edit/forward (#1490608)
---
program/steps/mail/func.inc | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index e7b6940..5436368 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -78,11 +78,12 @@
// set current mailbox and some other vars in client environment
$OUTPUT->set_env('mailbox', $mbox_name);
$OUTPUT->set_env('pagesize', $RCMAIL->storage->get_pagesize());
+ $OUTPUT->set_env('current_page', max(1, $_SESSION['page']));
$OUTPUT->set_env('delimiter', $delimiter);
$OUTPUT->set_env('threading', $threading);
$OUTPUT->set_env('threads', $threading || $RCMAIL->storage->get_capability('THREAD'));
$OUTPUT->set_env('reply_all_mode', (int) $RCMAIL->config->get('reply_all_mode'));
- $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0));
+ $OUTPUT->set_env('preview_pane_mark_read', (int) $RCMAIL->config->get('preview_pane_mark_read'));
if ($RCMAIL->storage->get_capability('QUOTA')) {
$OUTPUT->set_env('quota', true);
@@ -163,9 +164,11 @@
$mbox = strlen($_SESSION['mbox']) ? $_SESSION['mbox'] : 'INBOX';
}
- if ($RCMAIL->action == 'list') {
+ // we handle 'page' argument on 'list' and 'getunread' to prevent from
+ // race condition and unintentional page overwrite in session
+ if ($RCMAIL->action == 'list' || $RCMAIL->action == 'getunread') {
if (!($page = intval($_GET['_page']))) {
- $page = $_SESSION['page'] ? $_SESSION['page'] : 1;
+ $page = $_SESSION['page'] ?: 1;
}
$_SESSION['page'] = $page;
@@ -176,7 +179,7 @@
// set default sort col/order to session
if (!isset($_SESSION['sort_col'])) {
- $_SESSION['sort_col'] = $message_sort_col ? $message_sort_col : '';
+ $_SESSION['sort_col'] = $message_sort_col ?: '';
}
if (!isset($_SESSION['sort_order'])) {
$_SESSION['sort_order'] = strtoupper($message_sort_order) == 'ASC' ? 'ASC' : 'DESC';
@@ -1230,15 +1233,6 @@
// fetch part body
$body = $MESSAGE->get_part_body($part->mime_id, true);
- // extract headers from message/rfc822 parts
- if ($part->mimetype == 'message/rfc822') {
- $msgpart = rcube_mime::parse_message($body);
- if (!empty($msgpart->headers)) {
- $part = $msgpart;
- $out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
- }
- }
-
// message is cached but not exists (#1485443), or other error
if ($body === false) {
rcmail_message_error($MESSAGE->uid);
@@ -1631,7 +1625,7 @@
$content = rcube::Q($name ? sprintf('%s <%s>', $name, $mailto) : $mailto);
}
else {
- $content = rcube::Q($name ? $name : $mailto);
+ $content = rcube::Q($name ?: $mailto);
$attrs['title'] = $mailto;
}
@@ -1639,7 +1633,7 @@
}
else {
$address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
- rcube::Q($name ? $name : $mailto));
+ rcube::Q($name ?: $mailto));
}
if ($addicon && $_SESSION['writeable_abook']) {
@@ -2209,6 +2203,8 @@
function rcmail_save_attachment($message, $pid, $compose_id, $params = array())
{
+ global $COMPOSE;
+
$rcmail = rcmail::get_instance();
$storage = $rcmail->get_storage();
@@ -2271,7 +2267,26 @@
if ($attachment['status']) {
unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
- $rcmail->session->append('compose_data_' . $compose_id . '.attachments', $attachment['id'], $attachment);
+
+ $session_key = 'compose_data_' . $compose_id;
+
+ // rcube_session::append() replaces current session data with the old values
+ // (in rcube_session::reload()). This is a problem in 'compose' action, because before
+ // the first append() use we set some important data in the session.
+ // It also overwrites attachments list. Fixing reload() is not so simple if possible
+ // as we don't really know what has been added and what removed in meantime.
+ // So, for now we'll do not use append() on 'compose' action (#1490608).
+
+ if ($rcmail->action == 'compose') {
+ $_SESSION[$session_key]['attachments'][$attachment['id']] = $attachment;
+ }
+ else {
+ $rcmail->session->append($session_key . '.attachments', $attachment['id'], $attachment);
+ }
+
+ // Fix reference to compose session data after rcube_session::append()
+ $COMPOSE =& $_SESSION[$session_key];
+
return $attachment;
}
else if ($path) {
--
Gitblit v1.9.1