X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdownload.php;h=0b7ba61394f2b720877b6a49cfdec208ffce76e0;hp=22f9c60557d1e3921e90b0f36fd0564ed537492c;hb=631db37eb3dd4a0ca4b3c272f4219d601bda70f5;hpb=247240ed22bcf6b331bc8d968cd34ee5a80ef213
diff --git a/src/download.php b/src/download.php
index 22f9c605..0b7ba613 100644
--- a/src/download.php
+++ b/src/download.php
@@ -20,12 +20,12 @@ require_once('../functions/date.php');
header('Pragma: ');
header('Cache-Control: cache');
-function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
+
+function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at, $imapConnection) {
global $where, $what, $charset;
global $startMessage;
displayPageHeader($color, 'None');
-
echo "
".
"";
if ($type1 == 'html') {
- $body = MagicHTML( $body, $id );
+ $msg = sqimap_get_message($imapConnection, $id, $mailbox);
+ $msg = $msg->getEntity($entid);
+ $body = MagicHTML( $body, $id, $msg );
} else {
translateText($body, $wrap_at, $charset);
}
@@ -56,234 +58,108 @@ function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
" | |
".
- " |
". - "". - " |
". - " |
"; - echo "$bodyheader |
". - " |
"; - echo "$body |