improve smtp delivery failed message.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12091 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index 19d34d3a7c628dfb0f3cbf2ce1231adc78af8eff..de1c2f019ea07a6e3b4ace96769933660822cb14 100644 (file)
--- a/src/compose.php
+++ b/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

diff --git a/src/read_body.php b/src/read_body.php
index ec67a5b9fd2d604f888a5a3fa5dea545498ddafe..10c372b3a104605b4367632fce0d09ca3d99af78 100644 (file)
--- a/src/read_body.php
+++ b/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 . ' ' .