пре 22 година · 12c08cccdd
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -34,25 +34,6 @@ function sqm_baseuri(){
 
				     return $base_uri;
			
 
				 }
			
 
				 
			
 
				-function error_username_password_incorrect() {
			
 
				-    global $frame_top, $color;
			
 
				-    /* XXX: Should really not start the HTML before this, or close off more
			
 
				-       cleanly. */
			
 
				-
			
 
				-    if (!isset($frame_top)) {
			
 
				-        $frame_top = '_top';
			
 
				-    }
			
 
				-    $string = '<TR><TD ALIGN="center">'.
			
 
				-                 _("Unknown user or password incorrect.") .
			
 
				-              '</TD></TR><TR><TD ALIGN="center">'.
			
 
				-	         '<A HREF="' . sqm_baseuri() . '"login.php" TARGET='.
			
 
				-                    $frame_top.'>' . _("Click here to try again") .
			
 
				-                    '</A>.'.
			
 
				-              '</TD></TR>';
			
 
				-   error_box($string,$color);
			
 
				-echo  '</BODY></HTML>';
			
 
				-}
			
 
				-
			
 
				 function error_message($message, $mailbox, $sort, $startMessage, $color) {
			
 
				     $urlMailbox = urlencode($mailbox);
			
 
				 
			
@@ -154,7 +135,7 @@ function error_box($string, $color) {
 
				    echo '     <tr><td>';
			
 
				    echo '       <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
			
 
				    echo '        <tr><td ALIGN="center" bgcolor="'.$color[0].'">';
			
 
				-   echo '           <font color="' . $color[2].'"><b>' . _("ERROR") . ':</b></font>';
			
 
				+   echo '           <font color="' . $color[2].'"><b>' . $err . ':</b></font>';
			
 
				    echo '        </td></tr>';
			
 
				    echo '        <tr><td>';
			
 
				    echo '            <table cellpadding="1" cellspacing="5" align="center" border="0">';
			
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -36,11 +36,9 @@ function mime_structure ($bodystructure, $flags=array()) {
 
				         global $color, $mailbox;
			
 
				         /* removed urldecode because $_GET is auto urldecoded ??? */
			
 
				         displayPageHeader( $color, $mailbox );
			
 
				-        echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n\n" .
			
 
				-         '<CENTER>';
			
 
				         $errormessage  = _("SquirrelMail could not decode the bodystructure of the message");
			
 
				         $errormessage .= '<BR>'._("the provided bodystructure by your imap-server").':<BR><BR>';
			
 
				-        $errormessage .= '<table><tr><td>' . htmlspecialchars($read) . '</td></tr></table>';
			
 
				+        $errormessage .= '<pre>' . htmlspecialchars($read) . '</pre>';
			
 
				         plain_error_message( $errormessage, $color );
			
 
				         echo '</body></html>';
			
 
				         exit;