Added IMAP and SMTP STARTTLS extension support.

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 4f610ca5d710f0b37eddbd09c5f2bd0dbac0be9a..52f88ad27e13f7cbfd4bfb2fe2f21fda8b43d38a 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1640,9 +1640,14 @@ function deliverMessage($composeMessage, $draft=false) {
     }
     if (!$success) {
         // $deliver->dlv_server_msg is not always server's reply
-        $msg  = $deliver->dlv_msg . '<br />' .
-            _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
-            $deliver->dlv_server_msg;
+        $msg  = $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
+            $msg.='<br />' .
+                _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
+                nl2br(htmlspecialchars($deliver->dlv_server_msg));
+        }
         plain_error_message($msg, $color);
     } else {
         unset ($deliver);