瀏覽代碼

improve smtp delivery failed message.

Thijs Kinkhorst 18 年之前
父節點
當前提交
67263de26c
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 2 1
      src/compose.php
  2. 2 1
      src/read_body.php

+ 2 - 1
src/compose.php

@@ -1609,7 +1609,8 @@ function deliverMessage($composeMessage, $draft=false) {
     }
     }
     if (!$success) {
     if (!$success) {
         // $deliver->dlv_server_msg is not always server's reply
         // $deliver->dlv_server_msg is not always server's reply
-        $msg  = $deliver->dlv_msg;
+        $msg = _("Message not sent.") . "<br />\n" .
+            $deliver->dlv_msg;
         if (!empty($deliver->dlv_server_msg)) {
         if (!empty($deliver->dlv_server_msg)) {
             // add 'server replied' part only when it is not empty.
             // add 'server replied' part only when it is not empty.
             // Delivery error can be generated by delivery class itself
             // Delivery error can be generated by delivery class itself

+ 2 - 1
src/read_body.php

@@ -273,7 +273,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
         $success = $deliver->finalizeStream($stream);
         $success = $deliver->finalizeStream($stream);
     }
     }
     if (!$success) {
     if (!$success) {
-        $msg = $deliver->dlv_msg;
+        $msg = _("Message not sent.") . "<br />\n" .
+            $deliver->dlv_msg;
         if (! empty($deliver->dlv_server_msg)) {
         if (! empty($deliver->dlv_server_msg)) {
             $msg.= '<br />' .
             $msg.= '<br />' .
                 _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
                 _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .