summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-09-06 18:04:15 +0000
committerthomascube <thomas@roundcube.net>2008-09-06 18:04:15 +0000
commit0b6c1cf2b2f9530706bd7e4be2a2b08fa3754ce7 (patch)
treedccb667e3b5ca2ca00416fada66b4208dda022fb /program
parent9d55d2c8cab2e9c1c53590e81e39d4acb513fb90 (diff)
Give the user a second chance when sending failes due session error
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/sendmail.inc19
1 files changed, 10 insertions, 9 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 9a79317bc..9efb0d7ad 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -21,12 +21,17 @@
*/
-if (!isset($_SESSION['compose']['id']))
- {
+// remove all scripts and act as called in frame
+$OUTPUT->reset();
+$OUTPUT->framed = TRUE;
+
+
+if (!isset($_SESSION['compose']['id'])) {
raise_error(array('code' => 500, 'file' => __FILE__, 'message' => "Invalid compose ID"), true, false);
- rcmail_overwrite_action('compose');
- return;
- }
+ console("Sendmail error", $_SESSION['compose']);
+ $OUTPUT->show_message("An internal error occured. Please try again.", 'error');
+ $OUTPUT->send('iframe');
+}
/****** message sending functions ********/
@@ -117,10 +122,6 @@ if (strlen($_POST['_draft_saveid']) > 3)
$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $RCMAIL->config->mail_domain($_SESSION['imap_host']));
$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
-// remove all scripts and act as called in frame
-$OUTPUT->reset();
-$OUTPUT->framed = TRUE;
-
/****** check submission and compose message ********/