Rewrote multipart/* algorithm to be recursive

[squirrelmail.git] / src / read_body.php
diff --git a/src/read_body.php b/src/read_body.php

index 050f1c5ae7b815528aa3a14442a0c51fb6412a1a..1ec73d19434832d97deeefda48711cbdd92dedf6 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -13,7 +13,6 @@
     // $message contains all information about the message
     // including header and body
     $message = fetchMessage($imapConnection, $passed_id, $mailbox);
-   echo "$mailbox, $passed_id<BR>";
  
     echo "<HTML>";
     echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
@@ -79,9 +78,9 @@
     $subject = htmlspecialchars(stripslashes($message["HEADER"]["SUBJECT"]));
  
     echo "<BR>";
-   echo "<TABLE COLS=1 WIDTH=98% BORDER=0 ALIGN=CENTER CELLPADDING=2>\n";
+   echo "<TABLE COLS=1 CELLSPACING=0 WIDTH=98% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n";
     echo "   <TR><TD BGCOLOR=\"$color[0]\" WIDTH=100%>";
-   echo "      <TABLE WIDTH=100% BORDER=0 COLS=2>";
+   echo "      <TABLE WIDTH=100% CELLSPACING=0 BORDER=0 COLS=2 CELLPADDING=3>";
     echo "         <TR>";
     echo "            <TD ALIGN=LEFT WIDTH=50%>";
     echo "               <FONT FACE=\"Arial,Helvetica\" SIZE=2>";
@@ -97,11 +96,11 @@
     echo "         </TR>";
     echo "      </TABLE>";
     echo "   </TD></TR>";
-   echo "   <TR><TD BGCOLOR=\"$color[9]\" WIDTH=100%>";
+   echo "   <TR><TD CELLSPACING=0 WIDTH=100%>";
     echo "   <TABLE COLS=2 WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=3>\n";
     echo "      <TR>\n";
     /** subject **/
-   echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT>\n";
+   echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT>\n";
     echo "            <FONT FACE=\"Arial,Helvetica\">Subject:</FONT>\n";
     echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
     echo "            <FONT FACE=\"Arial,Helvetica\"><B>$subject</B></FONT>\n";
@@ -109,7 +108,7 @@
     echo "      </TR>\n";
     /** from **/
     echo "      <TR>\n";
-   echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT>\n";
+   echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT>\n";
     echo "            <FONT FACE=\"Arial,Helvetica\">From:</FONT>\n";
     echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
     echo "            <FONT FACE=\"Arial,Helvetica\"><B>$from_name</B></FONT>\n";
@@ -117,7 +116,7 @@
     echo "      </TR>\n";
     /** date **/
     echo "      <TR>\n";
-   echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT>\n";
+   echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT>\n";
     echo "            <FONT FACE=\"Arial,Helvetica\">Date:</FONT>\n";
     echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
     echo "            <FONT FACE=\"Arial,Helvetica\"><B>$dateString</B></FONT>\n";
@@ -125,7 +124,7 @@
     echo "      </TR>\n";
     /** to **/
     echo "      <TR>\n";
-   echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT VALIGN=TOP>\n";
+   echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT VALIGN=TOP>\n";
     echo "            <FONT FACE=\"Arial,Helvetica\">To:</FONT>\n";
     echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85% VALIGN=TOP>\n";
     echo "            <FONT FACE=\"Arial,Helvetica\"><B>$to_string</B></FONT>\n";
@@ -134,17 +133,19 @@
     /** cc **/
     if ($message["HEADER"]["CC"][0]) {
        echo "      <TR>\n";
-      echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=15% ALIGN=RIGHT VALIGN=TOP>\n";
+      echo "         <TD BGCOLOR=\"$color[4]\" WIDTH=15% ALIGN=RIGHT VALIGN=TOP>\n";
        echo "            <FONT FACE=\"Arial,Helvetica\">Cc:</FONT>\n";
        echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85% VALIGN=TOP>\n";
        echo "            <FONT FACE=\"Arial,Helvetica\"><B>$cc_string</B></FONT>\n";
        echo "         </TD>\n";
        echo "      </TR>\n";
     }
-   echo "   </TABLE></TD></TR>\n";
+   echo "</TABLE>";
+   echo "   </TD></TR>";
  
     echo "   <TR><TD BGCOLOR=\"$color[4]\" WIDTH=100%>\n";
     $body = formatBody($message);
+   echo "<BR>";
  
     for ($i = 0; $i < count($body); $i++) {
        echo "$body[$i]";