summaryrefslogtreecommitdiff
path: root/program/steps/mail/sendmail.inc
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-03-10 20:21:21 +0000
committerthomascube <thomas@roundcube.net>2011-03-10 20:21:21 +0000
commit4591de7018414267311b421ef42ef1b4a2f6aa89 (patch)
tree1c5c723c52a626b0ebafe379ddf7fe6382b064bb /program/steps/mail/sendmail.inc
parent8381ec1254f816bea2a5e85acb0a54722d327a60 (diff)
Prepare for multiple concurrent compose windows
Diffstat (limited to 'program/steps/mail/sendmail.inc')
-rw-r--r--program/steps/mail/sendmail.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 118e9edeb..a492e937c 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -26,6 +26,9 @@ $OUTPUT->framed = TRUE;
$savedraft = !empty($_POST['_draft']) ? true : false;
+$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GPC);
+$_SESSION['compose'] = $_SESSION['compose_data'][$COMPOSE_ID];
+
/****** checks ********/
if (!isset($_SESSION['compose']['id'])) {
@@ -702,7 +705,7 @@ if ($savedraft)
// remember new draft-uid
$draftuids = $IMAP->search_once($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid, true);
- $_SESSION['compose']['param']['_draft_uid'] = $draftuids[0];
+ $_SESSION['compose']['param']['draft_uid'] = $draftuids[0];
// display success
$OUTPUT->show_message('messagesaved', 'confirmation');
@@ -718,7 +721,7 @@ if ($savedraft)
}
else
{
- rcmail_compose_cleanup();
+ rcmail_compose_cleanup($COMPOSE_ID);
if ($store_folder && !$saved)
$OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'));