summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-07-07 17:29:45 +0000
committeralecpl <alec@alec.pl>2009-07-07 17:29:45 +0000
commitca90a9c174b815facf76295488567f281716179f (patch)
treead31aa968a4ef743b2e58c9b83b8ebf7ac1ed7fc
parentc1e9b0306166c80da4d3cddb170dece838780d5a (diff)
- handle smtp errors in show action (when mdn is send)
-rw-r--r--program/steps/mail/show.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 39d2e1a6c..2395ac604 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -84,9 +84,11 @@ if ($_GET['_uid']) {
{
if (intval($CONFIG['mdn_requests']) === 1)
{
- if (rcmail_send_mdn($MESSAGE->uid))
+ if (rcmail_send_mdn($MESSAGE->uid, $smtp_error))
$OUTPUT->show_message('receiptsent', 'confirmation');
- else
+ else if ($smtp_error)
+ $OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
+ else
$OUTPUT->show_message('errorsendingreceipt', 'error');
}
else if (empty($CONFIG['mdn_requests']))