From 85e60ada1558798669b29225aa530b4ba9310cdc Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 10 Nov 2013 14:04:33 +0100
Subject: First version of the local storage compose data saving feature; some
 behavioral improvements and encrytion are still to be added

---
 program/steps/mail/compose.inc  | 6 +++++-
 program/steps/mail/sendmail.inc | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 646d2bcd1..7f5435fa3 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -110,9 +110,10 @@ $OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubj
     'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage', 
     'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'uploadingmany',
     'fileuploaderror', 'sendmessage', 'savenewresponse', 'responsename', 'responsetext', 'save',
-    'savingresponse');
+    'savingresponse', 'restoresavedcomposedata', 'restoremessage', 'delete', 'restore');
 
 $OUTPUT->set_env('compose_id', $COMPOSE['id']);
+$OUTPUT->set_env('session_id', session_id());
 $OUTPUT->set_pagetitle(rcube_label('compose'));
 
 // add config parameters to client script
@@ -827,6 +828,9 @@ function rcmail_compose_body($attrib)
   $msgtype = new html_hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0")));
   $out .= $msgtype->show();
 
+  $framed = new html_hiddenfield(array('name' => '_framed', 'value' => '1'));
+  $out .= $framed->show();
+
   // If desired, set this textarea to be editable by TinyMCE
   if ($isHtml) {
     $MESSAGE_BODY = htmlentities($MESSAGE_BODY, ENT_NOQUOTES, RCMAIL_CHARSET);
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 52b02ecff..ea5eaaed1 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -855,6 +855,7 @@ else {
     $folders[] = $COMPOSE['mailbox'];
 
   rcmail_compose_cleanup($COMPOSE_ID);
+  $OUTPUT->command('remove_compose_data', $COMPOSE_ID);
 
   if ($store_folder && !$saved)
     $OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'), $folders);
-- 
cgit v1.2.3