Browse Source

oops, this error was already encoded, so back my r1.366 out, and part of
Tomas' r1.429

Thijs Kinkhorst 19 years ago
parent
commit
125748f28c
3 changed files with 7 additions and 7 deletions
  1. 1 1
      ChangeLog
  2. 3 3
      src/compose.php
  3. 3 3
      src/read_body.php

+ 1 - 1
ChangeLog

@@ -507,7 +507,7 @@ Version 1.5.1 -- CVS
     modified to provide support of $sendmail_args. Modifications broke backwards 
     modified to provide support of $sendmail_args. Modifications broke backwards 
     compatibility with qmail-inject workarounds.
     compatibility with qmail-inject workarounds.
   - Added execution error handling in Deliver_SendMail class (#1374174).
   - Added execution error handling in Deliver_SendMail class (#1374174).
-  - Sanitized message composition error messages.
+  - Sanitized Draft folder error message in compose.
 
 
 Version 1.5.0 - 2 February 2004
 Version 1.5.0 - 2 February 2004
 -------------------------------
 -------------------------------

+ 3 - 3
src/compose.php

@@ -1640,9 +1640,9 @@ 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  = htmlspecialchars($deliver->dlv_msg) . '<br />' .
-            _("Server replied:") . ' ' . htmlspecialchars($deliver->dlv_ret_nr) . ' ' .
-            htmlspecialchars($deliver->dlv_server_msg);
+        $msg  = $deliver->dlv_msg . '<br />' .
+            _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
+            $deliver->dlv_server_msg;
         plain_error_message($msg, $color);
         plain_error_message($msg, $color);
     } else {
     } else {
         unset ($deliver);
         unset ($deliver);

+ 3 - 3
src/read_body.php

@@ -262,9 +262,9 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
         $success = $deliver->finalizeStream($stream);
         $success = $deliver->finalizeStream($stream);
     }
     }
     if (!$success) {
     if (!$success) {
-        $msg  = htmlspecialchars($deliver->dlv_msg) . '<br />' .
-                _("Server replied:") . ' ' . htmlspecialchars($deliver->dlv_ret_nr . ' ' .
-                $deliver->dlv_server_msg);
+        $msg  = $deliver->dlv_msg . '<br />' .
+                _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
+                $deliver->dlv_server_msg;
         require_once(SM_PATH . 'functions/display_messages.php');
         require_once(SM_PATH . 'functions/display_messages.php');
         plain_error_message($msg, $color);
         plain_error_message($msg, $color);
     } else {
     } else {