X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=3c13148aabfb172e59a0bed10370d94714dad367;hb=57101712ce4958b9cfe73dede118c103ab07b98c;hp=1ec73d19434832d97deeefda48711cbdd92dedf6;hpb=4809f4894f2e81992b5e172aacb3e337da29e615;p=squirrelmail.git
diff --git a/src/read_body.php b/src/read_body.php
index 1ec73d19..3c13148a 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -7,7 +7,9 @@
include("../functions/mailbox.php");
include("../functions/date.php");
- $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
+ include("../src/load_prefs.php");
+
+ $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0);
selectMailbox($imapConnection, $mailbox, $numMessages);
// $message contains all information about the message
@@ -23,8 +25,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 = "";
@@ -40,11 +49,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)";
}
}
}
@@ -64,11 +73,11 @@
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)";
}
}
}
@@ -84,13 +93,24 @@
echo " ";
echo " | ";
echo " ";
- echo " Message List ";
- echo " Delete ";
+ echo " ";
+ echo _("Message List");
+ echo " | ";
+ echo " ";
+ echo _("Delete");
+ echo " ";
echo " ";
echo " | ";
echo " ";
- echo " Forward ";
- echo " Reply ";
+ echo " ";
+ echo _("Forward");
+ echo " | ";
+ echo " ";
+ echo _("Reply");
+ echo " | ";
+ echo " ";
+ echo _("Reply All");
+ echo " ";
echo " ";
echo " | ";
echo "
";
@@ -101,7 +121,9 @@
echo " \n";
/** subject **/
echo " | \n";
- echo " Subject:\n";
+ echo " ";
+ echo _("Subject:");
+ echo "\n";
echo " | \n";
echo " $subject\n";
echo " | \n";
@@ -109,7 +131,9 @@
/** from **/
echo "
\n";
echo " | \n";
- echo " From:\n";
+ echo " ";
+ echo _("From:");
+ echo "\n";
echo " | \n";
echo " $from_name\n";
echo " | \n";
@@ -117,7 +141,9 @@
/** date **/
echo "
\n";
echo " | \n";
- echo " Date:\n";
+ echo " ";
+ echo _("Date:");
+ echo "\n";
echo " | \n";
echo " $dateString\n";
echo " | \n";
@@ -125,7 +151,9 @@
/** to **/
echo "
\n";
echo " | \n";
- echo " To:\n";
+ echo " ";
+ echo _("To:");
+ echo "\n";
echo " | \n";
echo " $to_string\n";
echo " | \n";
@@ -144,15 +172,13 @@
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
+?>