Make use of the more detailed error reporting provided by the updated

deliver class

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

diff --git a/src/compose.php b/src/compose.php
index 6b6041323b9e56bdc8c8573eac56692528bf18f9..33332825eba0159ba09281e2f1ac6b8051a0c579 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1394,7 +1394,9 @@ function deliverMessage($composeMessage, $draft=false) {
        $succes = $deliver->finalizeStream($stream);
     }
     if (!$succes) {
-        $msg  = $deliver->dlv_msg . '<br>Server replied: '.$deliver->dlv_ret_nr;
+        $msg  = $deliver->dlv_msg . '<br>' .
+                _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+                $deliver->dlv_server_msg;
         plain_error_message($msg, $color);
     } else {
         unset ($deliver);

diff --git a/src/read_body.php b/src/read_body.php
index fa386594bbeab12ec99ddd965e798aa1fb09b6ce..289cbcaee06b3e13753e70950d6640c2d5d8dcaa 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -288,7 +288,9 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
         $success = $deliver->finalizeStream($stream);
     }
     if (!$success) {
-        $msg  = $deliver->dlv_msg . '<br>Server replied: '.$deliver->dlv_ret_nr;
+        $msg  = $deliver->dlv_msg . '<br>' .
+                _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+                $deliver->dlv_server_msg;
         require_once(SM_PATH . 'functions/display_messages.php');
         plain_error_message($msg, $color);
     } else {
@@ -456,7 +458,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
     echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
           $color[4].'"></TD></TR><TR><TD align=center>'."\n";
     echo $s;
-    do_hook("read_body_header");
+    do_hook('read_body_header');
     formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color);
     echo '</TABLE>';
     echo '</TD></TR><TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.$color[4].'"></TD></TR>'."\n";