summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/compose.inc8
-rw-r--r--program/steps/mail/sendmail.inc47
-rw-r--r--program/steps/mail/upload.inc12
3 files changed, 30 insertions, 37 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 877948c53..32378f59c 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -50,7 +50,7 @@ rcmail_compose_cleanup();
$_SESSION['compose'] = array('id' => uniqid(rand()));
// add some labels to client
-rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'savingmessage', 'messagesaved');
+rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved');
if ($_GET['_reply_uid'] || $_GET['_forward_uid'] || $_GET['_draft_uid'])
@@ -411,8 +411,8 @@ function rcmail_compose_body($attrib)
rcube_add_label('checking');
}
- $out .= '<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
-
+ $out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
+
return $out;
}
@@ -793,7 +793,5 @@ if ($DB->num_rows($sql_result))
}
-
-
parse_template('compose');
?>
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index b48dc0cf5..ddd180060 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -36,7 +36,6 @@ if (!isset($_SESSION['compose']['id']))
/****** message sending functions ********/
-
function rcmail_get_identity($id)
{
global $DB, $CHARSET, $OUTPUT;
@@ -63,20 +62,26 @@ function rcmail_get_identity($id)
return FALSE;
}
+
if (strlen($_POST['_draft_saveid']) > 3)
$olddraftmessageid = get_input_value('_draft_saveid', RCUBE_INPUT_POST);
$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $_SESSION['imap_host']);
-
$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
+// remove all scripts and act as called in frame
+$OUTPUT->reset();
+$_framed = TRUE;
+
+
/****** check submission and compose message ********/
if (empty($_POST['_to']) && empty($_POST['_subject']) && $_POST['_message'])
{
show_message("sendingfailed", 'error');
- rcmail_overwrite_action('compose');
+ //rcmail_overwrite_action('compose');
+ rcube_iframe_response();
return;
}
@@ -274,7 +279,7 @@ if (!$savedraft) {
if (!$sent)
{
show_message("sendingfailed", 'error');
- rcmail_overwrite_action('compose');
+ rcube_iframe_response();
return;
}
@@ -285,6 +290,8 @@ if (!$savedraft) {
} // End of SMTP Delivery Block
+
+
// Determine which folder to save message
if ($savedraft)
$store_target = 'drafts_mbox';
@@ -312,17 +319,13 @@ if ($CONFIG[$store_target])
// raise error if saving failed
if (!$saved)
{
- // clear the "saving message" busy status, and display failure
- $errorout = sprintf("parent.%s.display_message('%s', '%s');",
- $JS_OBJECT_NAME,
- addslashes(rep_specialchars_output(rcube_label(array('name' => 'errorsaving', 'vars' => NULL)))),
- 'error');
- print "<html><script type=\"text/javascript\">$errorout</script></html>";
raise_error(array('code' => 800,
'type' => 'imap',
'file' => __FILE__,
'message' => "Could not save message in $CONFIG[$store_target]"), TRUE, FALSE);
- exit;
+
+ show_message('errorsaving', 'error');
+ rcube_iframe_response($errorout);
}
if ($olddraftmessageid)
@@ -343,24 +346,20 @@ if ($CONFIG[$store_target])
if ($savedraft)
{
// clear the "saving message" busy status, and display success
- $frameout = sprintf("parent.%s.display_message('%s', '%s');",
- $JS_OBJECT_NAME,
- addslashes(rep_specialchars_output(rcube_label(array('name' => 'messagesaved', 'vars' => NULL)))),
- 'confirmation');
+ show_message('messagesaved', 'confirmation');
// update "_draft_saveid" on the page, which is used to delete a previous draft
- $frameout .= 'var foundid = parent.rcube_find_object("_draft_saveid",parent.document);';
- $frameout .= sprintf('foundid.value = "%s";',str_replace(array('<','>'),"",$message_id));
+ $frameout = "var foundid = parent.rcube_find_object('_draft_saveid', parent.document);\n";
+ $frameout .= sprintf("foundid.value = '%s';\n", str_replace(array('<','>'), "", $message_id));
// update the "cmp_hash" to prevent "Unsaved changes" warning
- $frameout .= sprintf("parent.%s.cmp_hash = parent.%s.compose_field_hash();",$JS_OBJECT_NAME,$JS_OBJECT_NAME);
-
+ $frameout .= sprintf("parent.%s.cmp_hash = parent.%s.compose_field_hash();\n", $JS_OBJECT_NAME, $JS_OBJECT_NAME);
+
// start the auto-save timer again
- $frameout .= sprintf("parent.%s.auto_save_start();",$JS_OBJECT_NAME);
+ $frameout .= sprintf("parent.%s.auto_save_start();", $JS_OBJECT_NAME);
// send html page with JS calls as response
- print "<html><script type=\"text/javascript\">$frameout</script></html>";
- exit;
+ rcube_iframe_response($frameout);
}
else
{
@@ -379,8 +378,10 @@ else
fclose($fp);
}
}
- show_message('messagesent', 'confirmation');
+
rcmail_compose_cleanup();
+ rcube_iframe_response(sprintf("parent.$JS_OBJECT_NAME.sent_successfully('%s');",
+ rep_specialchars_output(rcube_label('messagesent'), 'js')));
}
diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc
index 0af8eed46..abab3891b 100644
--- a/program/steps/mail/upload.inc
+++ b/program/steps/mail/upload.inc
@@ -53,18 +53,12 @@ foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
// send html page with JS calls as response
-print <<<EOF
-<html>
-<script type="text/javascript">
-if (parent.$JS_OBJECT_NAME)
-{
+$frameout = <<<EOF
$response
parent.$JS_OBJECT_NAME.show_attachment_form(false);
parent.$JS_OBJECT_NAME.auto_save_start();
-}
-</script>
-</html>
EOF;
-exit;
+
+rcube_iframe_response($frameout);
?>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 19:57:38 +0000