X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=46591cb7be5cc9633d14e550f150ae074a05b993;hp=838e402c915bfb8c4803ed5a0d10a8a81a493e65;hb=32b3d87eb50fd8a021cc5711aae022532a8cad12;hpb=32c7898caf59016a8b858f2dc3beb7f9e0049064 diff --git a/src/read_body.php b/src/read_body.php index 838e402c..46591cb7 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -1,20 +1,27 @@ "; echo "\n"; @@ -49,11 +56,11 @@ if (count($to_ary) > 1) { if ($show_more == false) { if ($i == 1) { - $to_string = "$to_string ($echo_more)"; + $to_string = "$to_string ($echo_more)"; $i = count($to_ary); } } else if ($i == 1) { - $to_string = "$to_string ($echo_less)"; + $to_string = "$to_string ($echo_less)"; } } } @@ -73,18 +80,18 @@ if (count($cc_ary) > 1) { if ($show_more_cc == false) { if ($i == 1) { - $cc_string = "$cc_string ($echo_more)"; + $cc_string = "$cc_string ($echo_more)"; $i = count($cc_ary); } } else if ($i == 1) { - $cc_string = "$cc_string ($echo_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 = decodeHeader(htmlspecialchars($message["HEADER"]["FROM"])); + $subject = decodeHeader(htmlspecialchars(stripslashes($message["HEADER"]["SUBJECT"]))); echo "
"; echo "\n"; @@ -92,26 +99,26 @@ echo "
"; echo " "; echo " "; echo " "; echo "
"; - echo " "; - echo " "; + echo " "; + echo " "; echo _("Message List"); echo " | "; - echo " "; + echo " "; echo _("Delete"); echo "  "; - echo " "; + echo " "; echo " "; - echo " "; - echo " "; + echo " "; + echo " "; echo _("Forward"); echo " | "; - echo " "; + echo " "; echo _("Reply"); echo " | "; - echo " "; + echo " "; echo _("Reply All"); echo "  "; - echo " "; + echo " "; echo "
"; @@ -121,50 +128,42 @@ echo " \n"; /** subject **/ echo " \n"; - echo " "; echo _("Subject:"); - echo "\n"; echo " \n"; - echo " $subject\n"; + echo " $subject\n"; echo " \n"; echo " \n"; /** from **/ echo " \n"; echo " \n"; - echo " "; echo _("From:"); - echo "\n"; echo " \n"; - echo " $from_name\n"; + echo " $from_name\n"; echo " \n"; echo " \n"; /** date **/ echo " \n"; echo " \n"; - echo " "; echo _("Date:"); - echo "\n"; echo " \n"; - echo " $dateString\n"; + echo " $dateString\n"; echo " \n"; echo " \n"; /** to **/ echo " \n"; echo " \n"; - echo " "; echo _("To:"); - echo "\n"; echo " \n"; - echo " $to_string\n"; + echo " $to_string\n"; echo " \n"; echo " \n"; /** cc **/ if ($message["HEADER"]["CC"][0]) { echo " \n"; echo " \n"; - echo " Cc:\n"; + echo " Cc:\n"; echo " \n"; - echo " $cc_string\n"; + echo " $cc_string\n"; echo " \n"; echo " \n"; }