diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-07 17:29:45 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-07 17:29:45 +0000 |
| commit | bd574bcf3ca5bd8872d972bf80d47fe762c44052 (patch) | |
| tree | 614b64efc6bf5a214bb928a8d1e337579084a5b8 | |
| parent | bf2b542bbb78d5a77a7edf942807f0755233c967 (diff) | |
- handle smtp errors in show action (when mdn is send)
git-svn-id: https://svn.roundcube.net/trunk@2722 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/mail/show.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc index 39d2e1a6c..2395ac604 100644 --- a/roundcubemail/program/steps/mail/show.inc +++ b/roundcubemail/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'])) |