Changeset 2722 in subversion

Timestamp:

Jul 7, 2009 1:29:45 PM (4 years ago)

Author:

alec

Message:

• handle smtp errors in show action (when mdn is send)

File:

• trunk/roundcubemail/program/steps/mail/show.inc (modified) (1 diff)

trunk/roundcubemail/program/steps/mail/show.inc

@@ -85 +85 @@
     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');
     }