X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=41ae3d5f0e0965142c87f568e0322657e3c4a47c;hb=474fc5fab3acc09ba21189e8c7c7a19dacb04c40;hp=b74b0584c16ca87e13e25b91c9ed36d5e578c1f0;hpb=ce274df943cb730e7008f94ca927f9f10c78da09;p=squirrelmail.git

diff --git a/src/read_body.php b/src/read_body.php
index b74b0584..41ae3d5f 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -52,20 +52,14 @@ function findNextMessage($passed_id) {
             }
         }
     } else {
-        if ($sort == 6) {
-            if ($passed_id != 1) {
-                $result = $passed_id - 1;
-            }
-        } else {
-            if (is_array($msort)) {
-                for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
-                    if ($passed_id == $msgs[$key]['ID']) {
-                        next($msort);
-                        $key = key($msort);
-                        if (isset($key)){
-                            $result = $msgs[$key]['ID'];
-                            break;
-                        }
+        if (is_array($msort)) {
+            for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
+                if ($passed_id == $msgs[$key]['ID']) {
+                    next($msort);
+                    $key = key($msort);
+                    if (isset($key)){
+                        $result = $msgs[$key]['ID'];
+                        break;
                     }
                 }
             }
@@ -95,21 +89,14 @@ function findPreviousMessage($numMessages, $passed_id) {
             }
         }
     } else {
-        if ($sort == 6) {
-            if ($passed_id != $numMessages) {
-                $result = $passed_id + 1;
-            }
-        } else {
-            if (is_array($msort)) {
-                for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
-                    if ($passed_id == $msgs[$key]['ID']) {
-                        prev($msort);
-                        $key = key($msort);
-                        if (isset($key)) {
-                            //echo $msort[$key];   /* Why again were we echoing here? */
-                            $result = $msgs[$key]['ID'];
-                            break;
-                        }
+        if (is_array($msort)) {
+            for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
+                if ($passed_id == $msgs[$key]['ID']) {
+                    prev($msort);
+                    $key = key($msort);
+                    if (isset($key)) {
+                        $result = $msgs[$key]['ID'];
+                        break;
                     }
                 }
             }
@@ -458,8 +445,8 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
         }
     }
 
-    $s  = '<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" 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>';
@@ -468,10 +455,16 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
             $s .= '</TR>';
         }
     }
+    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 $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>';
 }
 
 function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) {
@@ -658,8 +651,11 @@ elseif (isset($_POST['startMessage'])) {
 if (isset($_GET['show_more'])) {
     $show_more = $_GET['show_more'];
 }
-elseif (isset($_POST['show_more'])) {
-    $show_more = $_POST['show_more'];
+if (isset($_GET['show_more_cc'])) {
+    $show_more_cc = $_GET['show_more_cc'];
+}
+if (isset($_GET['show_more_bcc'])) {
+    $show_more_bcc = $_GET['show_more_bcc'];
 }
 if (isset($_GET['mailbox'])) {
     $mailbox = $_GET['mailbox'];
@@ -802,20 +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="0" cellspacing="0" align="center" border="0">';
-echo '              <tr><td><br>' . $messagebody . '</td></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>';