From c5e00971f9171be9cf8e12ac2f9a2d33ea5a0a70 Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 13 Aug 2008 17:00:35 +0000 Subject: #1485242: better handling of situation when message was sent successfully but cannot be saved git-svn-id: https://svn.roundcube.net/trunk@1644 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/mail/sendmail.inc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'roundcubemail/program/steps') diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index 090919e35..9888c5a97 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/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