Changeset 1755 in subversion

Timestamp:

Sep 6, 2008 2:04:15 PM (5 years ago)

Author:

thomasb

Message:

Give the user a second chance when sending failes due session error

File:

• trunk/roundcubemail/program/steps/mail/sendmail.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -22 +22 @@
 
 
-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');
+}
 
 
@@ -118 +123 @@
 $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 ********/