make use of new status function & make use of option show cumulative

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index 136edca690246f595ac9847a79447070ea1603cf..41ae3d5f0e0965142c87f568e0322657e3c4a47c 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -457,7 +457,8 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
     }
     echo '<TABLE BGCOLOR="'.$color[9].'" WIDTH="100%" CELLPADDING="1"'.
          ' CELLSPACING="0" BORDER="0" ALIIGN="center">'."\n";
-    echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.$color[4].'"></TD></TR><TR><TD 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);
@@ -787,15 +788,6 @@ for ($i = 0; $i < $cnt; $i++) {
        $messagebody .= '<hr noshade size=1>';
    }
 }
-$UIpref = 'captbunzo';
-/* handy preference utility to easy switch between preferences */
-if ($UIpref== 'captbunzo') {
-    $align= 'center';
-    $vert_lines = '<td bgcolor="'.$color[0].'"></td>'; /* test! Delete it when you are not satisfied */
-} else { 
-    $align= 'left';
-    $vert_lines = '';
-}
 
 displayPageHeader($color, $mailbox);
 formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
@@ -806,21 +798,24 @@ echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center" bor
 echo '      <tr><td>';
 echo '        <table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
 echo '          <tr bgcolor="'.$color[4].'"><td>';
-echo '            <table cellpadding="1" cellspacing="5" align="'.$align.'" border="0">';
-echo '              <tr>'.$vert_lines. html_tag( 'td', '<br>'. $messagebody."\n", 'left')
-                        .$vert_lines.'</td>';
+echo '            <table cellpadding="1" cellspacing="5" align="left" border="0">';
+echo '              <tr>' . html_tag( 'td', '<br>'. $messagebody."\n", 'left')
+                        . '</td>';
 echo '            </table>';
 echo '          </td></tr>';      
 echo '        </table></td></tr>';
 echo '    </table>';
 echo '  </td></tr>';
 
+echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
+          $color[4].'"></TD></TR><TR><TD align=center>'."\n";
+
 $attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
 if ($attachmentsdisplay) {
    echo '  <tr><td>';
    echo '    <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
    echo '     <tr><td>';
-   echo '       <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
+   echo '       <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
    echo '        <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
    echo '           <b>' . _("Attachments") . ':</b>';
    echo '        </td></tr>';