X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=a7beb54e75cf9624845e64bb6cd38252d25f7538;hp=84f7855795539aaddd803351fba7eb3a17406a26;hb=f8f9bed9bb69ef0432fbc67741f82071b6582b4d;hpb=de80e95e61d4a179a0d41ac4512c83818f3243ef
diff --git a/src/read_body.php b/src/read_body.php
index 84f78557..a7beb54e 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -3,71 +3,155 @@
include("../functions/strings.php");
include("../functions/page_header.php");
include("../functions/imap.php");
+ include("../functions/mime.php");
include("../functions/mailbox.php");
include("../functions/date.php");
$imapConnection = loginToImapServer($username, $key, $imapServerAddress);
selectMailbox($imapConnection, $mailbox, $numMessages);
- echo "
\n";
- displayPageHeader($mailbox);
- $body = fetchBody($imapConnection, $passed_id);
- getMessageHeaders($imapConnection, $passed_id, $passed_id, $f, $s, $d);
-// setMessageFlag($imapConnection, $passed_id, $passed_id, "Seen");
+ // $message contains all information about the message
+ // including header and body
+ $message = fetchMessage($imapConnection, $passed_id);
- $subject = $s[0];
- $d[0] = ereg_replace(" ", " ", $d[0]);
-// $date = explode(" ", trim($d[0]));
-// $date = getDateString($date);
- $date = $d[0];
- $from_name = getSenderName($f[0]);
+ echo "";
+ echo "";
+ echo "\n";
+ displayPageHeader($color, $mailbox);
+
+ /** translate the subject and mailbox into url-able text **/
+ $url_subj = urlencode(trim(stripslashes($message["HEADER"]["SUBJECT"])));
$urlMailbox = urlencode($mailbox);
+ $url_replyto = urlencode($message["HEADER"]["REPLYTO"]);
+
+ $dateString = getLongDateString($message["HEADER"]["DATE"]);
+
+ /** FORMAT THE TO STRING **/
+ $i = 0;
+ $to_string = "";
+ $to_ary = $message["HEADER"]["TO"];
+ while ($i < count($to_ary)) {
+ $to_ary[$i] = htmlspecialchars($to_ary[$i]);
+ if ($to_string)
+ $to_string = "$to_string
$to_ary[$i]";
+ else
+ $to_string = "$to_ary[$i]";
+
+ $i++;
+ if (count($to_ary) > 1) {
+ if ($show_more == false) {
+ if ($i == 1) {
+ $to_string = "$to_string (more)";
+ $i = count($to_ary);
+ }
+ } else if ($i == 1) {
+ $to_string = "$to_string (less)";
+ }
+ }
+ }
+
+ /** FORMAT THE CC STRING **/
+ $i = 0;
+ $cc_string = "";
+ $cc_ary = $message["HEADER"]["CC"];
+ while ($i < count($cc_ary)) {
+ $cc_ary[$i] = htmlspecialchars($cc_ary[$i]);
+ if ($cc_string)
+ $cc_string = "$cc_string
$cc_ary[$i]";
+ else
+ $cc_string = "$cc_ary[$i]";
+
+ $i++;
+ if (count($cc_ary) > 1) {
+ if ($show_more_cc == false) {
+ if ($i == 1) {
+ $cc_string = "$cc_string (more)";
+ $i = count($cc_ary);
+ }
+ } else if ($i == 1) {
+ $cc_string = "$cc_string (less)";
+ }
+ }
+ }
+
+ /** make sure everything will display in HTML format **/
+ $from_name = htmlspecialchars($message["HEADER"]["FROM"]);
+ $subject = htmlspecialchars(stripslashes($message["HEADER"]["SUBJECT"]));
echo "
";
echo "\n";
- echo " ";
- echo " ";
- echo " Message List ";
- echo " Delete ";
- echo " ";
+ echo " |
";
+ echo " ";
+ echo " ";
+ echo " ";
+ echo " ";
+ echo " Message List ";
+ echo " Delete ";
+ echo " ";
+ echo " | ";
+ echo " ";
+ echo " Forward ";
+ echo " Reply ";
+ echo " ";
+ echo " | ";
+ echo " ";
+ echo " ";
echo " |
";
- echo " ";
+ echo " |
";
echo " \n";
echo " \n";
/** subject **/
- echo " \n";
+ echo " | \n";
echo " Subject:\n";
- echo " | \n";
+ echo " | \n";
echo " $subject\n";
echo " | \n";
echo " \n";
/** from **/
echo " \n";
- echo " \n";
+ echo " | \n";
echo " From:\n";
- echo " | \n";
+ echo " | \n";
echo " $from_name\n";
echo " | \n";
echo " \n";
/** date **/
echo " \n";
- echo " \n";
+ echo " | \n";
echo " Date:\n";
- echo " | \n";
- echo " $date\n";
+ echo " | \n";
+ echo " $dateString\n";
echo " | \n";
echo " \n";
-
+ /** to **/
+ echo " \n";
+ echo " \n";
+ echo " To:\n";
+ echo " | \n";
+ echo " $to_string\n";
+ echo " | \n";
+ echo " \n";
+ /** cc **/
+ if ($message["HEADER"]["CC"][0]) {
+ echo " \n";
+ echo " \n";
+ echo " Cc:\n";
+ echo " | \n";
+ echo " $cc_string\n";
+ echo " | \n";
+ echo " \n";
+ }
echo " |
\n";
- echo " \n";
- $i = 0;
- while ($i < count($body)) {
+ echo " |
\n";
+ $body = formatBody($message);
+
+ for ($i = 0; $i < count($body); $i++) {
echo "$body[$i]";
- $i++;
}
+
echo "
|
\n";
- echo " |
";
+ echo " |
";
echo "
\n";
?>
\ No newline at end of file