Those ones can't be printed with & as they're into a javascript call.
[squirrelmail.git] / src / read_body.php
index a8eb3056dbd9c4af770d8f7fd0bcef07a9d8a16b..cfcba74dce9d1a6a7b34276c4559c77fe2f4e176 100644 (file)
@@ -116,7 +116,7 @@ function printer_friendly_link() {
 
     /* Output the link. */
     if ($javascript_on) {
-        $result .= '<script language="javascript">' . "\n" .
+        $result .= '<script language="javascript" type="text/javascript">' . "\n" .
                 '<!--' . "\n" .
                 "  function printFormat() {\n" .
                 '    window.open("../src/printer_friendly_main.php' .
@@ -139,25 +139,8 @@ function printer_friendly_link() {
 }
 
 function ServerMDNSupport( $read ) {
-
-    $num = 0;
-    $resp = '';
-    while ($num < count($read) ) {
-        $resp .= $read[$num];
-        $num++;
-    }
-    $read[] = split(' * ', $resp);
-    $num = 0;
-    $ret = FALSE;
-    while ( !$ret && $num < count($read) ) {
-        $ret = preg_match( '/.*PERMANENTFLAGS.*(MDNSent|\\\*).*/i', $read[$num] );
-        /*
-        if ( ereg('PERMANENTFLAGS', $read[$num] ) ) {
-            $ret = ( ereg('mdnsent',strtolower($read[$num]) ) || ereg("\\\*", $read[$num] ) );
-        }
-        */
-        $num++;
-    }
+    /* escaping $ doesn't work -> \x36 */    
+    $ret = preg_match( '/(\x36MDNSent|\\\*)/i', $read );
     return ( $ret );
 }
 
@@ -186,12 +169,7 @@ function SendMDN ( $recipient , $sender) {
             "\t" . _("Sent:") . ' ' . $senton . "\r\n" .
             "\r\n" .
             sprintf( _("Was displayed on %s"), $now );
-/*
-    $body = sprintf( _("This message sent on %s to %s with subject \"%s\" has been displayed on %s."),
-                      $senton, $to, $subject, $now ) .
-            "\r\n" .
-            _("This is no guarantee that the message has been read or understood.") . "\r\n";
-*/
+
     // part2  (RFC2298)
 
     $original_recipient = $to;
@@ -227,20 +205,13 @@ function SendMDN ( $recipient , $sender) {
 
 
 function ToggleMDNflag ( $set ) {
-
     global $imapConnection, $passed_id, $mailbox;
-
-    if ( $set ) {
-        $sg = '+';
-
-    } else {
-        $sg = '-';
-    }
-
-    $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
     sqimap_mailbox_select($imapConnection, $mailbox);
-    $read = sqimap_run_command ($imapConnection, $cmd, true, $response, $readmessage);
-
+    
+    $sg =  $set?'+':'-';
+    $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
+    $read = sqimap_run_command ($imapConnection, $cmd, true, $response, 
+                                $readmessage);
 }
 
 function ClearAttachments() {
@@ -269,8 +240,11 @@ function ClearAttachments() {
     $passed_id
 */
 
+if ( isset( $mailbox ) ) {
+    $mailbox = urldecode( $mailbox );
+}
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$read = sqimap_mailbox_select($imapConnection, $mailbox);
+$read = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
 
 do_hook('html_top');
 
@@ -280,7 +254,7 @@ do_hook('html_top');
 if( $default_use_mdn &&
     ( $mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', $default_use_mdn) ) ) {
 
-    $supportMDN = ServerMDNSupport($read);
+    $supportMDN = ServerMDNSupport($read["PERMANENTFLAGS"]);
     $flags = sqimap_get_flags ($imapConnection, $passed_id);
     $FirstTimeSee = !(in_array( 'Seen', $flags ));
 }
@@ -296,15 +270,15 @@ if (isset($view_hdr)) {
 
     echo '<BR>' .
         '<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="0" BORDER="0" ALIGN="CENTER">' . "\n" .
-        "   <TR><TD BGCOLOR=\"$color[9]\" WIDTH=\"100%\"><CENTER><B>" . _("Viewing Full Header") . '</B> - '.
+        "   <TR><TD BGCOLOR=\"$color[9]\" WIDTH=\"100%\" ALIGN=\"CENTER\"><B>" . _("Viewing Full Header") . '</B> - '.
         '<a href="' . $base_uri . "src/read_body.php?mailbox=".urlencode($mailbox);
     if (isset($where) && isset($what)) {
         // Got here from a search
-        echo "&passed_id=$passed_id&where=".urlencode($where)."&what=".urlencode($what).'">';
+        echo "&amp;passed_id=$passed_id&amp;where=".urlencode($where)."&amp;what=".urlencode($what).'">';
     } else {
-        echo "&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more\">";
+        echo "&amp;passed_id=$passed_id&amp;startMessage=$startMessage&amp;show_more=$show_more\">";
     }
-    echo _("View message") . "</a></b></center></td></tr></table>\n" .
+    echo _("View message") . "</a></b></td></tr></table>\n" .
          "<table width=\"99%\" cellpadding=2 cellspacing=0 border=0 align=center>\n" .
          '<tr><td>';
 
@@ -340,7 +314,9 @@ if (isset($view_hdr)) {
             $j++;
         }
         parseEmail($s);
-        if (isset($f)) echo "<nobr><tt><b>$f</b>$s</tt></nobr>";
+        if (isset($f)) {
+               echo "<nobr><tt><b>$f</b>$s</tt></nobr>";
+        }
     }
     echo "</td></tr></table>\n" .
          '</body></html>';
@@ -458,22 +434,22 @@ while ($i < count($to_ary)) {
             if ($i == 1) {
                 /* From a search... */
                 $to_string .= '&nbsp;(<A HREF="' . $base_uri .
-                             "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+                             "src/read_body.php?mailbox=$urlMailbox&amp;passed_id=$passed_id&amp;";
                 if (isset($where) && isset($what)) {
-                    $to_string .= 'where='.urlencode($where)."&what=".urlencode($what)."&show_more=1&show_more_cc=$show_more_cc\">$echo_more</A>)";
+                    $to_string .= 'where='.urlencode($where)."&amp;what=".urlencode($what)."&amp;show_more=1&amp;show_more_cc=$show_more_cc\">$echo_more</A>)";
                 } else {
-                    $to_string .= "sort=$sort&startMessage=$startMessage&show_more=1&show_more_cc=$show_more_cc\">$echo_more</A>)";
+                    $to_string .= "sort=$sort&amp;startMessage=$startMessage&amp;show_more=1&amp;show_more_cc=$show_more_cc\">$echo_more</A>)";
                 }
                 $i = count($to_ary);
             }
         } else if ($i == 1) {
             /* From a search... */
             $to_string .= '&nbsp;(<A HREF="' . $base_uri .
-                         "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+                         "src/read_body.php?mailbox=$urlMailbox&amp;passed_id=$passed_id&amp;";
             if (isset($where) && isset($what)) {
-                $to_string .= 'where='.urlencode($where)."&what=".urlencode($what)."&show_more=0&show_more_cc=$show_more_cc\">$echo_less</A>)";
+                $to_string .= 'where='.urlencode($where)."&amp;what=".urlencode($what)."&amp;show_more=0&amp;show_more_cc=$show_more_cc\">$echo_less</A>)";
             } else {
-                $to_string .= "sort=$sort&startMessage=$startMessage&show_more=0&show_more_cc=$show_more_cc\">$echo_less</A>)";
+                $to_string .= "sort=$sort&amp;startMessage=$startMessage&amp;show_more=0&amp;show_more_cc=$show_more_cc\">$echo_less</A>)";
             }
         }
     }
@@ -482,7 +458,7 @@ while ($i < count($to_ary)) {
 /** FORMAT THE CC STRING **/
 $i = 0;
 if (isset ($message->header->cc[0]) && trim($message->header->cc[0])) {
-    $cc_string = "";
+    $cc_string = '';
     $cc_ary = $message->header->cc;
     while ($i < count(decodeHeader($cc_ary))) {
         $cc_ary[$i] = htmlspecialchars($cc_ary[$i]);
@@ -500,30 +476,33 @@ if (isset ($message->header->cc[0]) && trim($message->header->cc[0])) {
                     $cc_string .= '&nbsp;(<A HREF="' . $base_uri .
                                   "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id";
                     if (isset($where) && isset($what)) {
-                        $cc_string .= '&what='.urlencode($what)."&where=".urlencode($where)."&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+                        $cc_string .= '&amp;what='.urlencode($what)."&amp;where=".urlencode($where)."&amp;show_more_cc=1&amp;show_more=$show_more\">$echo_more</A>)";
                     } else {
-                        $cc_string .= "&sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+                        $cc_string .= "&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more_cc=1&amp;show_more=$show_more\">$echo_more</A>)";
                     }
                     $i = count($cc_ary);
                 }
             } else if ($i == 1) {
                 /* From a search... */
                 $cc_string .= '&nbsp;(<A HREF="' . $base_uri .
-                              "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+                              "src/read_body.php?mailbox=$urlMailbox&amp;passed_id=$passed_id&amp;";
                 if (isset($where) && isset($what)) {
-                    $cc_string .= 'what=' . urlencode($what)."&where=".urlencode($where)."&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+                    $cc_string .= 'what=' . urlencode($what)."&amp;where=".urlencode($where)."&amp;show_more_cc=0&amp;show_more=$show_more\">$echo_less</A>)";
                 } else {
-                    $cc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+                    $cc_string .= "sort=$sort&amp;startMessage=$startMessage&amp;show_more_cc=0&amp;show_more=$show_more\">$echo_less</A>)";
                 }
             }
         }
     }
 }
+else {
+    $cc_string = '';
+}
 
 /** FORMAT THE BCC STRING **/
 $i = 0;
 if (isset ($message->header->bcc[0]) && trim($message->header->bcc[0])){
-    $bcc_string = "";
+    $bcc_string = '';
     $bcc_ary = $message->header->bcc;
     while ($i < count(decodeHeader($bcc_ary))) {
         $bcc_ary[$i] = htmlspecialchars($bcc_ary[$i]);
@@ -539,27 +518,30 @@ if (isset ($message->header->bcc[0]) && trim($message->header->bcc[0])){
                 if ($i == 1) {
                     /* From a search... */
                     $bcc_string .= '&nbsp;(<A HREF="' . $base_uri .
-                                   "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+                                   "src/read_body.php?mailbox=$urlMailbox&amp;passed_id=$passed_id&amp;";
                     if (isset($where) && isset($what)) {
-                        $bcc_string .= 'what=' . urlencode($what)."&where=".urlencode($where)."&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+                        $bcc_string .= 'what=' . urlencode($what)."&amp;where=".urlencode($where)."&amp;show_more_cc=1&amp;show_more=$show_more\">$echo_more</A>)";
                     } else {
-                        $bcc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+                        $bcc_string .= "sort=$sort&amp;startMessage=$startMessage&amp;show_more_cc=1&amp;show_more=$show_more\">$echo_more</A>)";
                     }
                     $i = count($bcc_ary);
                 }
             } else if ($i == 1) {
                 /* From a search... */
                 $bcc_string .= '&nbsp;(<A HREF="' . $base_uri .
-                               "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+                               "src/read_body.php?mailbox=$urlMailbox&amp;passed_id=$passed_id&amp;";
                 if (isset($where) && isset($what)) {
-                    $bcc_string .= 'what=' . urlencode($what)."&where=".urlencode($where)."&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+                    $bcc_string .= 'what=' . urlencode($what)."&amp;where=".urlencode($where)."&amp;show_more_cc=0&amp;show_more=$show_more\">$echo_less</A>)";
                 } else {
-                    $bcc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+                    $bcc_string .= "sort=$sort&amp;startMessage=$startMessage&amp;show_more_cc=0&amp;show_more=$show_more\">$echo_less</A>)";
                 }
             }
         }
     }
 }
+else {
+    $bcc_string = '';
+}
 
 if ($default_use_priority) {
     $priority_level = substr($message->header->priority,0,1);
@@ -605,22 +587,26 @@ if ($where && $what) {
     if( $pos == '' ) {
         $pos = 0;
     }
-    echo "search.php?where$pos=".urlencode($where)."&pos=$pos&what$pos=".urlencode($what)."&mailbox=$urlMailbox\">";
+    echo "search.php?where$pos=".urlencode($where)."&amp;pos=$pos&amp;what$pos=".urlencode($what)."&amp;mailbox=$urlMailbox\">";
 } else {
-    echo "right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
+    echo "right_main.php?sort=$sort&amp;startMessage=$startMessage&amp;mailbox=$urlMailbox\">";
 }
 echo _("Message List") .
      '</A>&nbsp;|&nbsp;' .
-     '<A HREF="' . $base_uri . "src/delete_message.php?mailbox=$urlMailbox&message=$passed_id&";
+     '<A HREF="' . $base_uri . "src/delete_message.php?mailbox=$urlMailbox&amp;message=$passed_id&amp;";
 if ($where && $what) {
-    echo 'where=' . urlencode($where) . '&what=' . urlencode($what) . '">';
+    echo 'where=' . urlencode($where) . '&amp;what=' . urlencode($what) . '">';
 } else {
-    echo "sort=$sort&startMessage=$startMessage\">";
+    echo "sort=$sort&amp;startMessage=$startMessage\">";
 }
 echo _("Delete") . '</A>&nbsp;';
 if (($mailbox == $draft_folder) && ($save_as_draft)) {
     echo '|&nbsp;<A HREF="' . $base_uri .
-         "src/compose.php?mailbox=$mailbox&send_to=$to_string&send_to_cc=$cc_string&send_to_bcc=$bcc_string&subject=$url_subj&draft_id=$passed_id&ent_num=$ent_num\">".
+         "src/compose.php?mailbox=$mailbox&amp;send_to=$to_string&amp;send_to_cc=$cc_string&amp;send_to_bcc=$bcc_string&amp;subject=$url_subj&amp;draft_id=$passed_id&amp;ent_num=$ent_num\"";
+    if ($compose_new_win == '1') {
+        echo 'TARGET="compose_window" onClick="comp_in_new()"';
+    }
+    echo '>'.
          _("Resume Draft") . '</a>';
 }
 
@@ -639,13 +625,13 @@ if ( !($where && $what) ) {
         $next = findNextMessage();
 
         if ($prev != -1) {
-            echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$prev&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Previous") . "</A>&nbsp;|&nbsp;";
+            echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$prev&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0\">" . _("Previous") . "</A>&nbsp;|&nbsp;";
         } else {
             echo _("Previous") . '&nbsp;|&nbsp;';
         }
 
         if ($next != -1) {
-            echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$next&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Next") . "</A>";
+            echo '<a href="' . $base_uri . "src/read_body.php?passed_id=$next&amp;mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage&amp;show_more=0\">" . _("Next") . "</A>";
         } else {
             echo _("Next");
         }
@@ -655,19 +641,31 @@ if ( !($where && $what) ) {
 echo                '</SMALL>' .
                 '</TD><TD WIDTH="33%" ALIGN="RIGHT">' .
                    '<SMALL>' .
-                   '<A HREF="' . $base_uri . "src/compose.php?forward_id=$passed_id&forward_subj=$url_subj&".
-                    ($default_use_priority?"mailprio=$priority_level&":"")
-                    ."mailbox=$urlMailbox&ent_num=$ent_num\">" .
+                   '<A HREF="' . $base_uri . "src/compose.php?forward_id=$passed_id&amp;forward_subj=$url_subj&amp;".
+                    ($default_use_priority?"mailprio=$priority_level&amp;":'')
+                    ."mailbox=$urlMailbox&amp;ent_num=$ent_num\"";
+    if ($compose_new_win == '1') {
+        echo 'TARGET="compose_window" onClick="comp_in_new()"';
+    }
+    echo '>'.
     _("Forward") .
     '</A>&nbsp;|&nbsp;' .
-                   '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replyto&reply_subj=$url_subj&".
-                    ($default_use_priority?"mailprio=$priority_level&":"").
-                    "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">" .
+                   '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replyto&amp;reply_subj=$url_subj&amp;".
+                    ($default_use_priority?"mailprio=$priority_level&amp;":'').
+                    "reply_id=$passed_id&amp;mailbox=$urlMailbox&amp;ent_num=$ent_num\"";
+    if ($compose_new_win == '1') {
+        echo 'TARGET="compose_window" onClick="comp_in_new()"';
+    }
+    echo '>'.
     _("Reply") .
     '</A>&nbsp;|&nbsp;' .
-                   '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replytoall&send_to_cc=$url_replytoallcc&reply_subj=$url_subj&".
-                    ($default_use_priority?"mailprio=$priority_level&":"").
-                    "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">" .
+                   '<A HREF="' . $base_uri . "src/compose.php?send_to=$url_replytoall&amp;send_to_cc=$url_replytoallcc&amp;reply_subj=$url_subj&amp;".
+                    ($default_use_priority?"mailprio=$priority_level&amp;":'').
+                    "reply_id=$passed_id&amp;mailbox=$urlMailbox&amp;ent_num=$ent_num\"";
+    if ($compose_new_win == '1') {
+        echo 'TARGET="compose_window" onClick="comp_in_new()"';
+    }
+    echo '>'.
     _("Reply All") .
     '</A>&nbsp;&nbsp;' .
                    '</SMALL>' .
@@ -675,7 +673,7 @@ echo                '</SMALL>' .
              '</TR>' .
           '</TABLE>' .
        '</TD></TR>' .
-       '<TR><TD CELLSPACING="0" WIDTH="100%">' .
+       '<TR><TD WIDTH="100%">' .
        '<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="3">' . "\n" .
           '<TR>' . "\n";
 
@@ -687,14 +685,14 @@ echo          "<TD BGCOLOR=\"$color[0]\" WIDTH=\"10%\" ALIGN=\"right\" VALIGN=\"
              "</TD>\n" .
              '<TD ROWSPAN="4" width="10%" BGCOLOR="' . $color[0] .
     '" ALIGN=right VALIGN=top NOWRAP><small>'.
-    '<A HREF="' . $base_uri . "src/read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&";
+    '<A HREF="' . $base_uri . "src/read_body.php?mailbox=$urlMailbox&amp;passed_id=$passed_id&amp;";
 
 /* From a search... */
 if ($where && $what) {
-    echo 'where=' . urlencode($where) . '&what=' . urlencode($what) .
-         "&view_hdr=1\">" . _("View Full Header") . "</A>\n";
+    echo 'where=' . urlencode($where) . '&amp;what=' . urlencode($what) .
+         "&amp;view_hdr=1\">" . _("View Full Header") . "</A>\n";
 } else {
-    echo "startMessage=$startMessage&show_more=$show_more&view_hdr=1\">" .
+    echo "startMessage=$startMessage&amp;show_more=$show_more&amp;view_hdr=1\">" .
          _("View Full Header") . "</A>\n";
 }
 
@@ -733,7 +731,7 @@ echo       "<TR>\n" .
              '</TD>' . "\n" .
           '</TR>' . "\n";
 /** cc **/
-if (isset($cc_string)) {
+if (isset($cc_string) && $cc_string <> '') {
     echo       '<TR>' .
                  "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
                     'Cc:' .
@@ -744,7 +742,7 @@ if (isset($cc_string)) {
 }
 
 /** bcc **/
-if (isset($bcc_string)) {
+if (isset($bcc_string) && $bcc_string <> '') {
     echo       '<TR>'.
                  "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
                     'Bcc:' .
@@ -753,16 +751,14 @@ if (isset($bcc_string)) {
                  '</TD>' .
               '</TR>' . "\n";
 }
-if ($default_use_priority) {
-    if (isset($priority_string)) {
-        echo       '<TR>' .
-                     "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
-                           _("Priority") . ': '.
-                     "</TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>" .
-                        "<B>$priority_string</B>&nbsp;" .
-                     '</TD>' .
-                  "</TR>" . "\n";
-    }
+if ($default_use_priority && isset($priority_string) && $priority_string <> '' ) {
+    echo       '<TR>' .
+                 "<TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>" .
+                       _("Priority") . ': '.
+                 "</TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>" .
+                    "<B>$priority_string</B>&nbsp;" .
+                 '</TD>' .
+              "</TR>" . "\n";
 }
 
 if ($show_xmailer_default) {
@@ -789,7 +785,7 @@ if ($default_use_mdn) {
     if ($mdn_user_support) {
 
         // debug gives you the capability to remove mdn-flags
-        $debug = false;
+        // $MDNDebug = false;
         $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY.PEEK[HEADER.FIELDS (Disposition-Notification-To)]", true,
                                 $response, $readmessage);
         $MDN_to = substr($read[1], strpos($read[1], ' '));
@@ -805,9 +801,10 @@ if ($default_use_mdn) {
 
             if ( $MDN_flag_present && $supportMDN) {
                 $sendreceipt = 'removeMDN';
-                $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
-                $sendreceipt="";
-                if ($debug ) {
+                $url = "\"read_body.php?mailbox=$mailbox&amp;passed_id=$passed_id&amp;startMessage=$startMessage&amp;show_more=$show_more&amp;sendreceipt=$sendreceipt\"";
+                $sendreceipt='';
+                /*
+                if ($MDNDebug ) {
                     echo       '<TR>' .
                                  "<TD BGCOLOR=\"$color[9]\"  ALIGN=RIGHT VALIGN=TOP>" .
                                        _("Read receipt") . ': ' .
@@ -818,17 +815,20 @@ if ($default_use_mdn) {
                                  '</TD>' .
                              '</TR>' . "\n";
                 } else {
-                    echo       '<TR>' .
-                                 "<TD BGCOLOR=\"$color[9]\"  ALIGN=RIGHT VALIGN=TOP>" .
-                                       _("Read receipt") . ': ' .
-                                 "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
-                                    '<B>'._("send").'</B>'.
-                                 '</TD>' .
-                             '</TR>' . "\n";
+                */
+                echo       '<TR>' .
+                             "<TD BGCOLOR=\"$color[9]\"  ALIGN=RIGHT VALIGN=TOP>" .
+                                   _("Read receipt") . ': ' .
+                             "</TD><TD BGCOLOR=\"$color[9]\" VALIGN=TOP colspan=2>" .
+                                '<B>'._("send").'</B>'.
+                             '</TD>' .
+                         '</TR>' . "\n";
+                /*
                 }
+                */
 
             } // when deleted or draft flag is set don't offer to send a MDN response
-            else if ( ereg('Draft',$read[0] || ereg('Deleted',$read[0])) ) {
+            else if ( ereg('\\Draft',$read[0] || ereg('\\Deleted',$read[0])) ) {
                 echo       '<TR>' .
                             "<TD BGCOLOR=\"$color[9]\"  ALIGN=RIGHT VALIGN=TOP>" .
                                 _("Read receipt") . ': '.
@@ -840,7 +840,7 @@ if ($default_use_mdn) {
             // if no MDNsupport don't use the annoying popup messages
             else if (  !$FirstTimeSee ) {
                 $sendreceipt = 'send';
-                $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
+                $url = "\"read_body.php?mailbox=$mailbox&amp;passed_id=$passed_id&amp;startMessage=$startMessage&amp;show_more=$show_more&amp;sendreceipt=$sendreceipt\"";
                 echo       '<TR>' .
                             "<TD BGCOLOR=\"$color[9]\"  ALIGN=RIGHT VALIGN=TOP>" .
                                 _("Read receipt") . ': ' .
@@ -853,9 +853,9 @@ if ($default_use_mdn) {
             }
             else {
                 $sendreceipt = 'send';
-                $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
+                $url = "\"read_body.php?mailbox=$mailbox&amp;passed_id=$passed_id&amp;startMessage=$startMessage&amp;show_more=$show_more&amp;sendreceipt=$sendreceipt\"";
                 if ($javascript_on) {
-                echo "<script language=\"javascript\">  \n" .
+                echo "<script language=\"javascript\" type=\"text/javascript\">  \n" .
                     '<!-- ' . "\n" .
                     "               if (window.confirm(\"" .
                     _("The message sender has requested a response to indicate that you have read this message. Would you like to send a receipt?") .
@@ -897,10 +897,10 @@ if ($default_use_mdn) {
                 }
             }
             $sendreceipt = 'removeMDN';
-            $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
-            $sendreceipt="";
-
-            if ($debug && $supportMDN) {
+            $url = "\"read_body.php?mailbox=$mailbox&amp;passed_id=$passed_id&amp;startMessage=$startMessage&amp;show_more=$show_more&amp;sendreceipt=$sendreceipt\"";
+            $sendreceipt='';
+                       /*
+            if ($MDNDebug && $supportMDN) {
             echo "      <TR>\n" .
                     "         <TD BGCOLOR=\"$color[9]\"  ALIGN=RIGHT VALIGN=TOP>\n" .
                     "            "._("Read receipt").": \n".
@@ -909,6 +909,7 @@ if ($default_use_mdn) {
                     '         </TD>' . "\n" .
                     '     </TR>' . "\n";
             } else {
+            */
             echo "      <TR>\n" .
                     "         <TD BGCOLOR=\"$color[9]\"  ALIGN=RIGHT VALIGN=TOP>\n" .
                     "            "._("Read receipt").": \n".
@@ -916,13 +917,15 @@ if ($default_use_mdn) {
                     '            <B>'._("send").'</B>'. "\n" .
                     '         </TD>' . "\n" .
                     '     </TR>' . "\n";
+            /*
             }
+            */
         }
         elseif ($sendreceipt == 'removeMDN' ) {
             ToggleMDNflag ( false );
 
             $sendreceipt = 'send';
-                $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\"";
+                $url = "\"read_body.php?mailbox=$mailbox&amp;passed_id=$passed_id&amp;startMessage=$startMessage&amp;show_more=$show_more&amp;sendreceipt=$sendreceipt\"";
                 echo       '<TR>'.
                               "<TD BGCOLOR=\"$color[9]\"  ALIGN=RIGHT VALIGN=TOP>" .
                                     _("Read receipt") . ': ' .
@@ -948,7 +951,7 @@ echo "<TABLE CELLSPACING=0 WIDTH=\"97%\" BORDER=0 ALIGN=CENTER CELLPADDING=0>\n"
     "   <TR><TD BGCOLOR=\"$color[4]\" WIDTH=\"100%\">\n" .
     '<BR>'.
     formatBody($imapConnection, $message, $color, $wrap_at).
-    '</TABLE>' .
+    '</TD></TR></TABLE>' .
     '<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' . "\n" .
     "   <TR><TD BGCOLOR=\"$color[9]\">&nbsp;</TD></TR>" .
     '</TABLE>' . "\n";
@@ -961,9 +964,9 @@ if (($attachment_common_show_images) &&
         $imgurl = '../src/download.php' .
                 '?' .
                 'passed_id='     . urlencode($img['passed_id']) .
-                '&mailbox='       . urlencode($mailbox) .
-                '&passed_ent_id=' . urlencode($img['ent_id']) .
-                '&absolute_dl=true';
+                '&amp;mailbox='       . urlencode($mailbox) .
+                '&amp;passed_ent_id=' . urlencode($img['ent_id']) .
+                '&amp;absolute_dl=true';
 
         echo "<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>\n" .
               '<TR>' .