From 3c621ba1116356a3a8e2616ef6d267f5edb3ea06 Mon Sep 17 00:00:00 2001
From: jervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 11 Aug 2004 05:10:19 +0000
Subject: [PATCH] XHTML fixes

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7881 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/mime.php                  | 30 ++++++------
 plugins/bug_report/system_specs.php |  4 +-
 src/printer_friendly_bottom.php     |  4 +-
 src/read_body.php                   | 60 +++++++++++------------
 src/right_main.php                  |  6 +--
 src/signout.php                     | 16 +++---
 src/vcard.php                       | 75 +++++++++++++++--------------
 src/view_header.php                 | 18 +++----
 src/view_text.php                   | 20 ++++----
 9 files changed, 117 insertions(+), 116 deletions(-)

diff --git a/functions/mime.php b/functions/mime.php
index d7ea053e..e342f75b 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -41,7 +41,7 @@ function mime_structure ($bodystructure, $flags=array()) {
         /* removed urldecode because $_GET is auto urldecoded ??? */
         displayPageHeader( $color, $mailbox );
         $errormessage  = _("SquirrelMail could not decode the bodystructure of the message");
-        $errormessage .= '<BR>'._("the provided bodystructure by your imap-server").':<BR><BR>';
+        $errormessage .= '<br />'._("the provided bodystructure by your imap-server").':<br /><br />';
         $errormessage .= '<pre>' . htmlspecialchars($read) . '</pre>';
         plain_error_message( $errormessage, $color );
         echo '</body></html>';
@@ -137,16 +137,16 @@ function mime_fetch_body($imap_stream, $id, $ent_id=1, $fetch_size=0) {
                 '&amp;message='  . urlencode($message)  .
                 '&amp;topline='  . urlencode($topline);
 
-        echo   '<tt><br>' .
+        echo   '<tt><br />' .
                '<table width="80%"><tr>' .
-               '<tr><td colspan=2>' .
+               '<tr><td colspan="2">' .
                _("Body retrieval error. The reason for this is most probably that the message is malformed.") .
                '</td></tr>' .
                '<tr><td><b>' . _("Command:") . "</td><td>$cmd</td></tr>" .
                '<tr><td><b>' . _("Response:") . "</td><td>$response</td></tr>" .
                '<tr><td><b>' . _("Message:") . "</td><td>$message</td></tr>" .
                '<tr><td><b>' . _("FETCH line:") . "</td><td>$topline</td></tr>" .
-               "</table><BR></tt></font><hr>";
+               "</table><br /></tt></font><hr />";
 
         $data = sqimap_run_command ($imap_stream, "FETCH $passed_id BODY[]", true, $response, $message, TRUE);
         array_shift($data);
@@ -233,7 +233,7 @@ function mime_print_body_lines ($imap_stream, $id, $ent_id=1, $encoding) {
  */
 function listEntities ($message) {
     if ($message) {
-        echo "<tt>" . $message->entity_id . ' : ' . $message->type0 . '/' . $message->type1 . ' parent = '. $message->parent->entity_id. '<br>';
+        echo "<tt>" . $message->entity_id . ' : ' . $message->type0 . '/' . $message->type1 . ' parent = '. $message->parent->entity_id. '<br />';
         for ($i = 0; isset($message->entities[$i]); $i++) {
             echo "$i : ";
             $msg = listEntities($message->entities[$i]);
@@ -414,7 +414,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
         if($text != '') {
             $body .= '&nbsp;|&nbsp;<a href="read_body.php?' . $link . '">' . $text . '</a>';
         }
-        $body .= '</small></center><br>' . "\n";
+        $body .= '</small></center><br />' . "\n";
     }
     return $body;
 }
@@ -522,14 +522,14 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
         $links = $hookresults[1];
         $defaultlink = $hookresults[6];
 
-        $attachments .= '<TR><TD>' .
-                        '<A HREF="'.$defaultlink.'">'.decodeHeader($display_filename).'</A>&nbsp;</TD>' .
-                        '<TD><SMALL><b>' . show_readable_size($header->size) .
-                        '</b>&nbsp;&nbsp;</small></TD>' .
-                        '<TD><SMALL>[ '.htmlspecialchars($type0).'/'.htmlspecialchars($type1).' ]&nbsp;</SMALL></TD>' .
-                        '<TD><SMALL>';
+        $attachments .= '<tr><td>' .
+                        '<a href="'.$defaultlink.'">'.decodeHeader($display_filename).'</a>&nbsp;</td>' .
+                        '<td><small><b>' . show_readable_size($header->size) .
+                        '</b>&nbsp;&nbsp;</small></td>' .
+                        '<td><small>[ '.htmlspecialchars($type0).'/'.htmlspecialchars($type1).' ]&nbsp;</small></td>' .
+                        '<td><small>';
         $attachments .= '<b>' . $description . '</b>';
-        $attachments .= '</SMALL></TD><TD><SMALL>&nbsp;';
+        $attachments .= '</small></td><td><small>&nbsp;';
 
         $skipspaces = 1;
         foreach ($links as $val) {
@@ -541,7 +541,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
             $attachments .= '<a href="' . $val['href'] . '">' .  $val['text'] . '</a>';
         }
         unset($links);
-        $attachments .= "</TD></TR>\n";
+        $attachments .= "</td></tr>\n";
     }
     $attachmentadd = do_hook_function('attachments_bottom',$attachments);
     if ($attachmentadd != '')
@@ -2059,4 +2059,4 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') {
 
 }  // end fn SendDownloadHeaders
 
-?>
+?>
\ No newline at end of file
diff --git a/plugins/bug_report/system_specs.php b/plugins/bug_report/system_specs.php
index c270de14..984dd69c 100644
--- a/plugins/bug_report/system_specs.php
+++ b/plugins/bug_report/system_specs.php
@@ -117,11 +117,11 @@ if (isset($warning) && $warning) {
             $warning_html .= "<dd>* $corr_val</dd>\n";
         }
     }
-    $warning_html .= "</dl>\n<p>$warning_num warning(s) reported.</p>\n<hr>\n";
+    $warning_html .= "</dl>\n<p>$warning_num warning(s) reported.</p>\n<hr />\n";
     $body_top .= "\n$warning_num warning(s) reported.\n";
     $body_top .= "----------------------------------------------\n";
 }
 
 $body = htmlspecialchars($body_top . $body);
 
-?>
+?>
\ No newline at end of file
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index ee49b2fb..a4280087 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -144,7 +144,7 @@ echo '<body text="#000000" bgcolor="#FFFFFF" link="#000000" vlink="#000000" alin
      }
      /* body */
      echo html_tag( 'tr',
-         html_tag( 'td', '<hr noshade size="1" /><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
+         html_tag( 'td', '<hr noshade size="1" /><br />' . "\n" . $body, 'left', '', 'colspan="2"' )
      ) . "\n" .
 
      '</table>' . "\n" .
@@ -191,4 +191,4 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
 
 /* --end pf-specific functions */
 
-?>
+?>
\ No newline at end of file
diff --git a/src/read_body.php b/src/read_body.php
index 31cd0a47..c3b73903 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -347,15 +347,15 @@ function formatRecipientString($recipients, $item ) {
         foreach($recipients as $r) {
             $add = decodeHeader($r->getAddress(true));
             if ($string) {
-                $string .= '<BR>' . $add;
+                $string .= '<br />' . $add;
             } else {
                 $string = $add;
                 if ($cnt > 1) {
-                    $string .= '&nbsp;(<A HREF="'.$url;
+                    $string .= '&nbsp;(<a href="'.$url;
                     if ($show) {
-                       $string .= '">'._("less").'</A>)';
+                       $string .= '">'._("less").'</a>)';
                     } else {
-                       $string .= '">'._("more").'</A>)';
+                       $string .= '">'._("more").'</a>)';
                        break;
                     }
                 }
@@ -425,26 +425,26 @@ function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message,
         }
     }
 
-    $s  = '<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="2" BORDER="0"';
-    $s .= ' ALIGN="center" BGCOLOR="'.$color[0].'">';
+    $s  = '<table width="100%" cellpadding="0" cellspacing="2" border="0"';
+    $s .= ' align="center" bgcolor="'.$color[0].'">';
     foreach ($env as $key => $val) {
         if ($val) {
-            $s .= '<TR>';
-            $s .= html_tag('TD', '<B>' . $key . ':&nbsp;&nbsp;</B>', 'RIGHT', '', 'VALIGN="TOP" WIDTH="20%"') . "\n";
-            $s .= html_tag('TD', $val, 'left', '', 'VALIGN="TOP" WIDTH="80%"') . "\n";
-            $s .= '</TR>';
+            $s .= '<tr>';
+            $s .= html_tag('td', '<b>' . $key . ':&nbsp;&nbsp;</b>', 'right', '', 'valign="top" width="20%"') . "\n";
+            $s .= html_tag('td', $val, 'left', '', 'valign="top" width="80%"') . "\n";
+            $s .= '</tr>';
         }
     }
-    echo '<TABLE BGCOLOR="'.$color[9].'" WIDTH="100%" CELLPADDING="1"'.
-         ' CELLSPACING="0" BORDER="0" ALIGN="center">'."\n";
-    echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
-          $color[4].'"></TD></TR><TR><TD align=center>'."\n";
+    echo '<table bgcolor="'.$color[9].'" width="100%" cellpadding="1"'.
+         ' cellspacing="0" border="0" align="center">'."\n";
+    echo '<tr><td height="5" colspan="2" bgcolor="'.
+          $color[4].'"></td></tr><tr><td align="center">'."\n";
     echo $s;
     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";
-    echo '</TABLE>';
+    echo '</table>';
+    echo '</td></tr><tr><td height="5" colspan="2" bgcolor="'.$color[4].'"></td></tr>'."\n";
+    echo '</table>';
 }
 
 /**
@@ -715,9 +715,9 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
 
     $url = $base_uri.'src/view_header.php?'.$query_string;
 
-    $s  = "<TR>\n" .
-          html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '<B>' . _("Options") . ":&nbsp;&nbsp;</B></TD>\n" .
-          html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '<SMALL>' .
+    $s  = "<tr>\n" .
+          html_tag( 'td', '', 'right', '', 'valign="middle" width="20%"' ) . '<b>' . _("Options") . ":&nbsp;&nbsp;</b></td>\n" .
+          html_tag( 'td', '', 'left', '', 'valign="middle" width="80%"' ) . '<small>' .
           '<a href="'.$url.'">'._("View Full Header").'</a>';
 
     /* Output the printer friendly link if we are in subtle mode. */
@@ -725,8 +725,8 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
           printer_friendly_link($mailbox, $passed_id, $passed_ent_id);
     echo $s;
     do_hook("read_body_header_right");
-    $s = "</SMALL></TD>\n" .
-         "</TR>\n";
+    $s = "</small></td>\n" .
+         "</tr>\n";
     echo $s;
 
 }
@@ -879,7 +879,7 @@ $cnt = count($ent_ar);
 for ($i = 0; $i < $cnt; $i++) {
    $messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
    if ($i != $cnt-1) {
-       $messagebody .= '<hr noshade size=1>';
+       $messagebody .= '<hr noshade size=1 />';
    }
 }
 
@@ -894,7 +894,7 @@ echo '        <table width="100%" cellpadding="3" cellspacing="0" align="center"
 echo '          <tr bgcolor="'.$color[4].'"><td>';
 // echo '            <table cellpadding="1" cellspacing="5" align="left" border="0">';
 echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' );
-echo '              <tr>' . html_tag( 'td', '<br>'. $messagebody."\n", 'left')
+echo '              <tr>' . html_tag( 'td', '<br />'. $messagebody."\n", 'left')
                         . '</tr>';
 echo '            </table>';
 echo '          </td></tr>';
@@ -902,8 +902,8 @@ echo '        </table></td></tr>';
 echo '    </table>';
 echo '  </td></tr>';
 
-echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
-          $color[4].'"></TD></TR>'."\n";
+echo '<tr><td height="5" colspan="2" bgcolor="'.
+          $color[4].'"></td></tr>'."\n";
 
 $attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
 if ($attachmentsdisplay) {
@@ -920,8 +920,8 @@ if ($attachmentsdisplay) {
    echo '          </td></tr></table>';
    echo '       </td></tr></table>';
    echo '  </td></tr>';
-   echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
-          $color[4].'"></TD></TR>';
+   echo '<tr><td height="5" colspan="2" bgcolor="'.
+          $color[4].'"></td></tr>';
 }
 echo '</table>';
 
@@ -938,10 +938,10 @@ if (($attachment_common_show_images) &&
 
         echo html_tag( 'table', "\n" .
                     html_tag( 'tr', "\n" .
-                        html_tag( 'td', '<img src="' . $imgurl . '">' ."\n", 'left'
+                        html_tag( 'td', '<img src="' . $imgurl . '" />' ."\n", 'left'
                         )
                     ) ,
-        'center', '', 'cellspacing=0 border="0" cellpadding="2"');
+        'center', '', 'cellspacing="0" border="0" cellpadding="2"');
     }
 }
 
diff --git a/src/right_main.php b/src/right_main.php
index ac40bf2a..5ce2ba2f 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -204,7 +204,7 @@ if (isset($mail_sent) && $mail_sent == 'yes') {
     $note = _("Your Message has been sent.");
 }
 if (isset($note)) {
-    echo html_tag( 'div', '<b>' . $note .'</b>', 'center' ) . "<br>\n";
+    echo html_tag( 'div', '<b>' . $note .'</b>', 'center' ) . "<br />\n";
 }
 
 if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
@@ -231,7 +231,7 @@ if ($aMailbox['EXISTS'] > 0) {
     showMessagesForMailbox($imapConnection,$aMailbox);
 } else {
     $string = '<b>' . _("THIS FOLDER IS EMPTY") . '</b>';
-    echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
+    echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[9].'">';
     echo '     <tr><td>';
     echo '       <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
     echo '        <tr><td><br />';
@@ -252,4 +252,4 @@ echo '</body></html>';
 $mailbox_cache[$aMailbox['NAME']] = $aMailbox;
 sqsession_register($mailbox_cache,'mailbox_cache');
 
-?>
+?>
\ No newline at end of file
diff --git a/src/signout.php b/src/signout.php
index 9d2d5735..3dece37c 100644
--- a/src/signout.php
+++ b/src/signout.php
@@ -64,16 +64,16 @@ if ($signout_page) {
 <?php
     if ($theme_css != '') {
 ?>
-   <link rel="stylesheet" type="text/css" href="<?php echo $theme_css ?>" />
+   <link rel="stylesheet" type="text/css" href="<?php echo $theme_css; ?>" />
 <?php
     }
 ?>
    <title><?php echo $org_title . ' - ' . _("Signout"); ?></title>
 </head>
-<body text="<?php echo $color[8] ?>" bgcolor="<?php echo $color[4] ?>" 
-link="<?php echo $color[7] ?>" vlink="<?php echo $color[7] ?>"
-alink="<?php echo $color[7] ?>">
-<br><br>
+<body text="<?php echo $color[8]; ?>" bgcolor="<?php echo $color[4]; ?>" 
+link="<?php echo $color[7]; ?>" vlink="<?php echo $color[7]; ?>"
+alink="<?php echo $color[7]; ?>">
+<br /><br />
 <?php
 $plugin_message = concat_hook_function('logout_above_text');
 echo
@@ -84,12 +84,12 @@ html_tag( 'table',
     $plugin_message .
     html_tag( 'tr',
          html_tag( 'td', _("You have been successfully signed out.") .
-             '<br><a href="login.php" target="' . $frame_top . '">' .
-             _("Click here to log back in.") . '</a><br>' ,
+             '<br /><a href="login.php" target="' . $frame_top . '">' .
+             _("Click here to log back in.") . '</a><br />' ,
          'center' ) ,
     '', $color[4], 'width="100%"' ) .
     html_tag( 'tr',
-         html_tag( 'td', '<br>', 'center' ) ,
+         html_tag( 'td', '<br />', 'center' ) ,
     '', $color[0], 'width="100%"' ) ,
 'center', $color[4], 'width="50%" cols="1" cellpadding="2" cellspacing="0" border="0"' )
 ?>
diff --git a/src/vcard.php b/src/vcard.php
index aa180a9c..a0994cff 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -42,11 +42,12 @@ sqimap_mailbox_select($imapConnection, $mailbox);
 
 displayPageHeader($color, 'None');
 
-echo '<br><table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
-            'align="center">' . "\n" .
-        '<tr><td bgcolor="' . $color[0] . '">' .
-        '<b><center>' .
-        _("Viewing a Business Card") . " - ";
+echo '<br /><table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
+        'align="center">' . "\n" .
+     '<tr><td bgcolor="' . $color[0] . '">' .
+     '<b><center>' .
+     _("Viewing a Business Card") . " - ";
+
 $msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
     '&amp;startMessage='.urlencode($startMessage).
     '&amp;passed_id='.urlencode($passed_id);
@@ -116,8 +117,8 @@ $ShowValues = array(
     'tel;fax' =>        _("Fax"),
     'note' =>           _("Note"));
 
-echo '<tr><td><br>' .
-        '<TABLE border=0 cellpadding=2 cellspacing=0 align=center>' . "\n";
+echo '<tr><td><br />' .
+     '<table border="0" cellpadding="2" cellspacing="0" align="center">' . "\n";
 
 if (isset($vcard_safe['email;internet'])) {
     $vcard_safe['email;internet'] = makeComposeLink('src/compose.php?send_to='.urlencode($vcard_safe['email;internet']),
@@ -125,35 +126,35 @@ if (isset($vcard_safe['email;internet'])) {
 }
 
 if (isset($vcard_safe['url'])) {
-    $vcard_safe['url'] = '<A HREF="' . $vcard_safe['url'] . '">' .
-        $vcard_safe['url'] . '</A>';
+    $vcard_safe['url'] = '<a href="' . $vcard_safe['url'] . '">' .
+        $vcard_safe['url'] . '</a>';
 }
 
 foreach ($ShowValues as $k => $v) {
     if (isset($vcard_safe[$k]) && $vcard_safe[$k])     {
-        echo "<tr><td align=right><b>$v:</b></td><td>" . $vcard_safe[$k] .
+        echo "<tr><td align=\"right\"><b>$v:</b></td><td>" . $vcard_safe[$k] .
                 "</td><tr>\n";
     }
 }
 
 echo '</table>' .
-        '<br>' .
-        '</td></tr></table>' .
-        '<table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
+     '<br />' .
+     '</td></tr></table>' .
+     '<table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
         'align="center">' .
-        '<tr>' .
-        '<td bgcolor="' . $color[0] . '">' .
-        '<b><center>' .
-        _("Add to Addressbook") .
-        '</td></tr>' .
-        '<tr><td align=center>' .
-	addForm('../src/addressbook.php', 'POST', 'f_add') .
-        '<table border=0 cellpadding=2 cellspacing=0 align=center>' .
-        '<tr><td align=right><b>' . _("Nickname:") . '</b></td>' .
-        '<td>'.
-	addInput('addaddr[nickname]', $vcard_safe['firstname'] . '-' . $vcard_safe['lastname'], '20').
-        '</td></tr>' .
-        '<tr><td align=right><b>' . _("Note Field Contains:") . '</b></td><td>' ;
+     '<tr>' .
+     '<td bgcolor="' . $color[0] . '">' .
+     '<b><center>' .
+     _("Add to Addressbook") .
+     '</td></tr>' .
+     '<tr><td align="center">' .
+     addForm('../src/addressbook.php', 'POST', 'f_add') .
+     '<table border="0" cellpadding="2" cellspacing="0" align="center">' .
+     '<tr><td align="right"><b>' . _("Nickname:") . '</b></td>' .
+     '<td>'.
+     addInput('addaddr[nickname]', $vcard_safe['firstname'] . '-' . $vcard_safe['lastname'], '20').
+     '</td></tr>' .
+     '<tr><td align="right"><b>' . _("Note Field Contains:") . '</b></td><td>' ;
 
 $opts = array();
 if (isset($vcard_nice['url'])) {
@@ -189,7 +190,7 @@ if (isset($vcard_nice['note'])) {
 
 echo    addSelect('addaddr[label]', $opts, '', TRUE);
 echo    '</td></tr>' .
-        '<tr><td colspan=2 align=center>' .
+        '<tr><td colspan="2" align="center">' .
 	addHidden('addaddr[email]', $vcard_nice['email;internet']).
 	addHidden('addaddr[firstname]', $vcard_safe['firstname']).
 	addHidden('addaddr[lastname]', $vcard_safe['lastname']).
@@ -198,16 +199,16 @@ echo    '</td></tr>' .
         '</table>' .
         '</form>' .
         '</td></tr>' .
-        '<tr><td align=center>' .
+        '<tr><td align="center">' .
         '<a href="../src/download.php?absolute_dl=true&amp;passed_id=' .
-        urlencode($passed_id) . '&amp;mailbox=' . urlencode($mailbox) .
-        '&amp;ent_id=' . urlencode($ent_id) . '">' .
-        _("Download this as a file") . '</A>' .
-        '</TD></TR></TABLE>' .
-
-        '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' .
-        '<TR><TD BGCOLOR="' . $color[4] . '">' .
-        '</TD></TR></TABLE>' .
+            urlencode($passed_id) . '&amp;mailbox=' . urlencode($mailbox) .
+            '&amp;ent_id=' . urlencode($ent_id) . '">' .
+        _("Download this as a file") . '</a>' .
+        '</td></tr></table>' .
+
+        '<table border="0" cellspacing="0" cellpadding="2" align="center">' .
+        '<tr><td bgcolor="' . $color[4] . '">' .
+        '</td></tr></table>' .
         '</body></html>';
 
-?>
+?>
\ No newline at end of file
diff --git a/src/view_header.php b/src/view_header.php
index 030eb869..28089fbc 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -87,19 +87,19 @@ function view_header($header, $mailbox, $color) {
 
     displayPageHeader($color, $mailbox);
 
-    echo '<BR>' .
-         '<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="0" BORDER="0"'.
-         ' ALIGN="CENTER">' . "\n" .
-         "   <TR><TD BGCOLOR=\"$color[9]\" WIDTH=\"100%\" ALIGN=\"CENTER\"><B>".
-         _("Viewing Full Header") . '</B> - '.
+    echo '<br />' .
+         '<table width="100%" cellpadding="2" cellspacing="0" border="0" '.
+            'align="center">' . "\n" .
+         '<tr><td bgcolor="'.$color[9].'" width="100%" align="center"><b>'.
+         _("Viewing Full Header") . '</b> - '.
          '<a href="'; 
     echo_template_var($ret_addr);
     echo '">' ._("View message") . "</a></b></td></tr></table>\n";
 
     echo_template_var($header, 
-         array(
-           "<table width='99%' cellpadding='2' cellspacing='0' border='0'".
-             "align=center>\n".'<tr><td>',
+        array(
+            '<table width="99%" cellpadding="2" cellspacing="0" border="0" '.
+                "align=center>\n".'<tr><td>',
            '<nobr><tt><b>',
            '</b>',
            '</tt></nobr>',
@@ -130,4 +130,4 @@ $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, t
 $header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id); 
 view_header($header, $mailbox, $color);
 
-?>
+?>
\ No newline at end of file
diff --git a/src/view_text.php b/src/view_text.php
index 9e316625..2c2b54b4 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -78,17 +78,17 @@ if ($type1 == 'html' || (isset($override_type1) &&  $override_type1 == 'html'))
 
 displayPageHeader($color, 'None');
 
-echo '<BR><TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR="' . $color[0] . '">' .
-     '<B><CENTER>' .
+echo '<br /><table width="100%" border="0" cellspacing="0" cellpadding="0" align="center"><tr><td bgcolor="' . $color[0] . '">' .
+     '<b><center>' .
      _("Viewing a text attachment") . ' - ' .
      '<a href="'.$msg_url.'">'. _("View message") . '</a>' .
-     '</b></td><tr><tr><td><CENTER><A HREF="' . $dwnld_url . '">' .
+     '</b></td><tr><tr><td><center><a href="' . $dwnld_url . '">' .
      _("Download this as a file") .
-     '</A></CENTER><BR>' .
-     '</CENTER></B>' .
-     '</TD></TR></TABLE>' .
-     '<TABLE WIDTH="98%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR="' . $color[0] . '">' .
-     '<TR><TD BGCOLOR="' . $color[4] . '"><TT>' .
-     $body . '</TT></TD></TR></TABLE>' .
+     '</a></center><br />' .
+     '</center></b>' .
+     '</td></tr></table>' .
+     '<table width="98%" border="0" cellspacing="0" cellpadding="2" align="center"><tr><td bgcolor="' . $color[0] . '">' .
+     '<tr><td bgcolor="' . $color[4] . '"><tt>' .
+     $body . '</tt></td></tr></table>' .
      '</body></html>';
-?>
+?>
\ No newline at end of file
-- 
2.25.1