projects / squirrelmail.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added some preferences, and squashed soem bugs
[squirrelmail.git] / src / read_body.php
diff --git a/src/read_body.php b/src/read_body.php
index 7e98d1a599bd275a64e0433297859a4cdb2d8abc..c20a455081f5bfe6aa5b60d1bea7bd4528fb9e07 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -7,22 +7,23 @@
    include("../functions/mailbox.php");
    include("../functions/date.php");
 
+   include("../src/load_prefs.php");
+
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
    selectMailbox($imapConnection, $mailbox, $numMessages);
 
    // $message contains all information about the message
    // including header and body
-   $message = fetchMessage($imapConnection, $passed_id);
+   $message = fetchMessage($imapConnection, $passed_id, $mailbox);
 
    echo "<HTML>";
-   echo "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"" . $message["HEADER"]["TYPE"][0] . "/" . $message["HEADER"]["TYPE"][1] . "; charset=" . $message["HEADER"]["CHARSET"] . "\">";
-   echo "<BODY TEXT=\"#000000\" BGCOLOR=\"#FFFFFF\" LINK=\"#0000EE\" VLINK=\"#0000EE\" ALINK=\"#0000EE\">\n";
-   displayPageHeader($mailbox);
+   echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
+   displayPageHeader($color, $mailbox);
 
    /** translate the subject and mailbox into url-able text **/
-   $url_subj = urlencode(trim($message["HEADER"]["SUBJECT"]));
+   $url_subj = urlencode(trim(stripslashes($message["HEADER"]["SUBJECT"])));
    $urlMailbox = urlencode($mailbox);
-   $url_from = urlencode($message["HEADER"]["FROM"]);
+   $url_replyto = urlencode($message["HEADER"]["REPLYTO"]);
 
    $dateString = getLongDateString($message["HEADER"]["DATE"]);
 
@@ -76,12 +77,12 @@
 
    /** make sure everything will display in HTML format **/
    $from_name = htmlspecialchars($message["HEADER"]["FROM"]);
-   $subject = htmlspecialchars($message["HEADER"]["SUBJECT"]);
+   $subject = htmlspecialchars(stripslashes($message["HEADER"]["SUBJECT"]));
 
    echo "<BR>";
-   echo "<TABLE COLS=1 WIDTH=95% BORDER=0 ALIGN=CENTER CELLPADDING=2>\n";
-   echo "   <TR><TD BGCOLOR=DCDCDC WIDTH=100%>";
-   echo "      <TABLE WIDTH=100% BORDER=0 COLS=2>";
+   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% CELLSPACING=0 BORDER=0 COLS=2 CELLPADDING=3>";
    echo "         <TR>";
    echo "            <TD ALIGN=LEFT WIDTH=50%>";
    echo "               <FONT FACE=\"Arial,Helvetica\" SIZE=2>";
@@ -91,88 +92,67 @@
    echo "            </TD><TD WIDTH=50% ALIGN=RIGHT>";
    echo "               <FONT FACE=\"Arial,Helvetica\" SIZE=2>";
    echo "               <A HREF=\"compose.php?forward_id=$passed_id&forward_subj=$url_subj&mailbox=$urlMailbox\">Forward</A>&nbsp;&nbsp;";
-   echo "               <A HREF=\"compose.php?send_to=$url_from&reply_subj=$url_subj&reply_id=$passed_id&mailbox=$urlMailbox\">Reply</A>&nbsp;&nbsp;";
+   echo "               <A HREF=\"compose.php?send_to=$url_replyto&reply_subj=$url_subj&reply_id=$passed_id&mailbox=$urlMailbox\">Reply</A>&nbsp;&nbsp;";
    echo "               </FONT>";
    echo "            </TD>";
    echo "         </TR>";
    echo "      </TABLE>";
    echo "   </TD></TR>";
-   echo "   <TR><TD BGCOLOR=FFFFFF WIDTH=100%>";
-   echo "   <TABLE COLS=2 WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=2>\n";
+   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=FFFFFF 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=FFFFFF WIDTH=85%>\n";
+   echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
    echo "            <FONT FACE=\"Arial,Helvetica\"><B>$subject</B></FONT>\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** from **/
    echo "      <TR>\n";
-   echo "         <TD BGCOLOR=FFFFFF 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=FFFFFF WIDTH=85%>\n";
+   echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
    echo "            <FONT FACE=\"Arial,Helvetica\"><B>$from_name</B></FONT>\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** date **/
    echo "      <TR>\n";
-   echo "         <TD BGCOLOR=FFFFFF 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=FFFFFF WIDTH=85%>\n";
+   echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85%>\n";
    echo "            <FONT FACE=\"Arial,Helvetica\"><B>$dateString</B></FONT>\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** to **/
    echo "      <TR>\n";
-   echo "         <TD BGCOLOR=FFFFFF 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=FFFFFF WIDTH=85% VALIGN=TOP>\n";
+   echo "         </TD><TD BGCOLOR=\"$color[4]\" WIDTH=85% VALIGN=TOP>\n";
    echo "            <FONT FACE=\"Arial,Helvetica\"><B>$to_string</B></FONT>\n";
    echo "         </TD>\n";
    echo "      </TR>\n";
    /** cc **/
    if ($message["HEADER"]["CC"][0]) {
       echo "      <TR>\n";
-      echo "         <TD BGCOLOR=FFFFFF 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=FFFFFF WIDTH=85% VALIGN=TOP>\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=FFFFFF WIDTH=100%>\n";
-   $body = formatBody($message);
-   for ($i = 0; $i < count($body); $i++) {
-      echo "$body[$i]";
-   }
+   echo "   <TR><TD BGCOLOR=\"$color[4]\" WIDTH=100%>\n";
+   $body = formatBody($message, $color, $wrap_at);
+   echo "<BR>";
 
-/*   if (count($message["ENTITIES"]) > 1) {
-      echo "</TD></TR><TR><TD BGCOLOR=DCDCDC><CENTER><B><FONT COLOR=DD0000>This is a multipart MIME encoded message.</FONT></B></CENTER></TD></TR><TR><TD BGCOLOR=FFFFFF WIDTH=100%>";
-      echo "";
-
-      $i = 0;
-      $q = 0;
-      $entity[0] = $i;
-      while ($i < count($message["ENTITIES"])) {
-         $b = $i + 1;
-         echo "</TD></TR><TR><TD BGCOLOR=DCDCDC><CENTER>Part $b</CENTER></TD></TR><TR><TD BGCOLOR=FFFFFF WIDTH=100%>";
-         for ($p = 0; $p < count($message["ENTITIES"][$i][0]["BODY"]); $p++) {
-            echo $message["ENTITIES"][$i][0]["BODY"][$p];
-         }
-         $i++;
-      }
-   } else {
-      echo "</TD></TR><TR><TD BGCOLOR=DCDCDC><CENTER><B><FONT COLOR=DD0000>This is a single part MIME encoded message.</FONT></B></CENTER></TD></TR><TR><TD BGCOLOR=FFFFFF WIDTH=100%>";
-      for ($p = 0; $p < count($message["ENTITIES"][0]["BODY"]); $p++) {
-         echo $message["ENTITIES"][0]["BODY"][$p];
-      }
-   }
-*/
-   echo "   <BR></TD></TR>\n";
-   echo "   <TR><TD BGCOLOR=DCDCDC>&nbsp;</TD></TR>";
+   echo "$body";
+
+   echo "   </TD></TR>\n";
+   echo "   <TR><TD BGCOLOR=\"$color[9]\">&nbsp;</TD></TR>";
    echo "</TABLE>\n";
 
 ?>
\ No newline at end of file
Unnamed repository; edit this file 'description' to name the repository.