X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=7ef156042419906e12f9b847789c9c86c80375ce;hb=9988d19e65d7ea81cb1dfaf534a54d45a13ba2c7;hp=88c1093faf8935f3fd0621977b50dfb47bf0a5d4;hpb=5c55c29540e62b101fcebdb779daf3309bde2709;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index 88c1093f..7ef15604 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -1,37 +1,102 @@ -"; - echo ""; - echo "\n"; - displayPageHeader($mailbox); + echo "\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_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 = ""; $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 @@ -41,11 +106,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 +130,121 @@ 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($message["HEADER"]["SUBJECT"]); + $from_name = decodeHeader(htmlspecialchars($message["HEADER"]["FROM"])); + $subject = decodeHeader(htmlspecialchars(stripslashes($message["HEADER"]["SUBJECT"]))); echo "
"; - echo "\n"; - echo "

"; - echo " "; + echo "

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

"; + echo " "; echo " "; - echo " "; echo " "; echo "

"; - echo " "; - echo " Message List "; - echo " Delete "; - echo " "; - echo "

"; - echo " "; - echo " Forward "; - echo " Reply "; - echo " "; + echo "

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

"; + echo " \n"; + if ($currentArrayIndex == -1) { + echo "Previous | Next"; + } else { + $prev = findPreviousMessage(); + $next = findNextMessage(); + if ($prev != -1) + echo "" . _("Previous") . " | "; + else + echo _("Previous") . " | "; + if ($next != -1) + echo "" . _("Next") . ""; + else + echo _("Next"); + } + echo " \n"; + echo "

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

"; echo "

"; - echo " \n"; + echo " \n"; + 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\n"; + echo "	\n"; + echo _("Subject:"); + echo "	\n"; + echo " $subject\n"; echo "
\n"; - echo " From:\n"; - echo "	\n"; - echo " $from_name\n"; + echo "	\n"; + echo _("From:"); + echo "	\n"; + echo " $from_name\n"; echo "
\n"; - echo " Date:\n"; - echo "	\n"; - echo " $dateString\n"; + echo "	\n"; + echo _("Date:"); + echo "	\n"; + echo " $dateString\n"; echo "
\n"; - echo " To:\n"; - echo "	\n"; - echo " $to_string\n"; + echo "	\n"; + echo _("To:"); + echo "	\n"; + echo " $to_string\n"; echo "
\n"; - echo " Cc:\n"; - echo "	\n"; - echo " $cc_string\n"; + echo "	\n"; + echo " Cc:\n"; + echo "	\n"; + echo " $cc_string\n"; echo "

"; + echo "

\n"; - $body = formatBody($message); + echo "

\n"; + $body = formatBody($message, $color, $wrap_at); + echo "
"; - for ($i = 0; $i < count($body); $i++) { - echo "$body[$i]"; - } + echo "$body"; - echo "

\n"; -?> \ No newline at end of file +?>