Changeset 2713 in subversion for trunk/roundcubemail/program/steps/mail/func.inc

Timestamp:

Jul 6, 2009 5:13:10 AM (4 years ago)

Author:

alec

Message:

• Show SMTP errors in browser (#1485927)

File:

• trunk/roundcubemail/program/steps/mail/func.inc (modified) (4 diffs)

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

@@ -1303 +1303 @@
  * Send the given message compose object using the configured method
  */
-function rcmail_deliver_message(&$message, $from, $mailto)
+function rcmail_deliver_message(&$message, $from, $mailto, &$smtp_error)
 {
   global $CONFIG, $RCMAIL;
@@ -1328 +1328 @@
     // send message
     $smtp_response = array();
-    $sent = smtp_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers, true)), $msg_body, $smtp_response);
+    $sent = smtp_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers, true)), $msg_body, $smtp_response, $smtp_error);
 
     // log error
@@ -1381 +1381 @@
 
 
-function rcmail_send_mdn($uid)
+function rcmail_send_mdn($uid, &$smtp_error)
 {
   global $RCMAIL, $IMAP;
@@ -1439 +1439 @@
     $compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');
 
-    $sent = rcmail_deliver_message($compose, $identity['email'], $mailto);
+    $sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error);
 
     if ($sent)