X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=4c9f5c312cb984f7c625c77095b55b592aa2361e;hb=cdee225a75cd2bb3121227a4b7c4cfff058c1ae2;hp=050f1c5ae7b815528aa3a14442a0c51fb6412a1a;hpb=97be216806423d7008317ac7b4ca81ca8a4c8504;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index 050f1c5a..4c9f5c31 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -1,19 +1,25 @@ "; + $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); echo ""; echo "\n"; @@ -24,8 +30,15 @@ $urlMailbox = urlencode($mailbox); $url_replyto = urlencode($message["HEADER"]["REPLYTO"]); + $url_replytoall = urlencode($message["HEADER"]["REPLYTO"]); + $url_replytoallcc = urlencode(getLineOfAddrs($message["HEADER"]["TO"]) . ", " . getLineOfAddrs($message["HEADER"]["CC"])); + $dateString = getLongDateString($message["HEADER"]["DATE"]); + /** TEXT STRINGS DEFINITIONS **/ + $echo_more = _("more"); + $echo_less = _("less"); + /** FORMAT THE TO STRING **/ $i = 0; $to_string = ""; @@ -41,11 +54,11 @@ if (count($to_ary) > 1) { if ($show_more == false) { if ($i == 1) { - $to_string = "$to_string (more)"; + $to_string = "$to_string ($echo_more)"; $i = count($to_ary); } } else if ($i == 1) { - $to_string = "$to_string (less)"; + $to_string = "$to_string ($echo_less)"; } } } @@ -65,93 +78,104 @@ if (count($cc_ary) > 1) { if ($show_more_cc == false) { if ($i == 1) { - $cc_string = "$cc_string (more)"; + $cc_string = "$cc_string ($echo_more)"; $i = count($cc_ary); } } else if ($i == 1) { - $cc_string = "$cc_string (less)"; + $cc_string = "$cc_string ($echo_less)"; } } } /** make sure everything will display in HTML format **/ - $from_name = htmlspecialchars($message["HEADER"]["FROM"]); - $subject = htmlspecialchars(stripslashes($message["HEADER"]["SUBJECT"])); + $from_name = htmlspecialchars(decodeHeader($message["HEADER"]["FROM"])); + $subject = htmlspecialchars(decodeHeader(stripslashes($message["HEADER"]["SUBJECT"]))); echo "
"; - echo "\n"; + echo "

\n"; echo " "; - echo " \n"; + echo "

"; - echo " "; + echo "

"; echo " "; echo " "; echo " "; echo "

"; - echo " "; - echo " Message List "; - echo " Delete "; - echo " "; + echo " "; + echo " "; + echo _("Message List"); + echo " | "; + echo " "; + echo _("Delete"); + echo " "; + echo " "; echo "

"; - echo " "; - echo " Forward "; - echo " Reply "; - echo " "; + echo " "; + echo " "; + echo _("Forward"); + echo " | "; + echo " "; + echo _("Reply"); + echo " | "; + echo " "; + echo _("Reply All"); + echo " "; + echo " "; echo "

"; echo "

"; + echo "

"; echo " \n"; echo " \n"; /** subject **/ - echo " \n"; echo " \n"; /** from **/ echo " \n"; - echo " \n"; echo " \n"; /** date **/ echo " \n"; - echo " \n"; echo " \n"; /** to **/ echo " \n"; - echo " \n"; echo " \n"; /** cc **/ if ($message["HEADER"]["CC"][0]) { echo " \n"; - echo " \n"; echo " \n"; } - echo "

\n"; - echo " Subject:\n"; + echo "	\n"; + echo _("Subject:"); echo "	\n"; - echo " $subject\n"; + echo " $subject\n"; echo "
\n"; - echo " From:\n"; + echo "	\n"; + echo _("From:"); echo "	\n"; - echo " $from_name\n"; + echo " $from_name\n"; echo "
\n"; - echo " Date:\n"; + echo "	\n"; + echo _("Date:"); echo "	\n"; - echo " $dateString\n"; + echo " $dateString\n"; echo "
\n"; - echo " To:\n"; + echo "	\n"; + echo _("To:"); echo "	\n"; - echo " $to_string\n"; + echo " $to_string\n"; echo "
\n"; - echo " Cc:\n"; + echo "	\n"; + echo " Cc:\n"; echo "	\n"; - echo " $cc_string\n"; + echo " $cc_string\n"; echo "

"; + echo " "; echo " \n"; - $body = formatBody($message); + $body = formatBody($message, $color, $wrap_at); + echo "
"; - for ($i = 0; $i < count($body); $i++) { - echo "$body[$i]"; - } + echo "$body"; - echo "
\n"; - echo " "; + echo " \n"; + echo " "; echo "\n"; -?> \ No newline at end of file +?>