From 9a5762a4de13a23a45ac9b85ff475aaf877cf906 Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 13 Aug 2008 17:00:35 +0000 Subject: #1485242: better handling of situation when message was sent successfully but cannot be saved --- program/steps/mail/sendmail.inc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'program/steps/mail') diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 090919e35..9888c5a97 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -377,8 +377,10 @@ if ($store_target) raise_error(array('code' => 800, 'type' => 'imap', 'file' => __FILE__, 'message' => "Could not save message in $store_target"), TRUE, FALSE); - $OUTPUT->show_message('errorsaving', 'error'); - $OUTPUT->send('iframe'); + if ($savedraft) { + $OUTPUT->show_message('errorsaving', 'error'); + $OUTPUT->send('iframe'); + } } if ($olddraftmessageid) @@ -434,7 +436,11 @@ else } rcmail_compose_cleanup(); - $OUTPUT->command('sent_successfully', rcube_label('messagesent')); + + if ($store_folder && !$saved) + $OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent')); + else + $OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent')); $OUTPUT->send('iframe'); } -- cgit v1.2.3