Parcourir la source

improve smtp delivery failed message.

Thijs Kinkhorst il y a 18 ans
Parent
commit
67263de26c
2 fichiers modifiés avec 4 ajouts et 2 suppressions
  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) {
         // $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)) {
             // add 'server replied' part only when it is not empty.
             // 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);
     }
     if (!$success) {
-        $msg = $deliver->dlv_msg;
+        $msg = _("Message not sent.") . "<br />\n" .
+            $deliver->dlv_msg;
         if (! empty($deliver->dlv_server_msg)) {
             $msg.= '<br />' .
                 _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .