X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdownload.php;h=dd0b65aa1363fdecb9056ec68ac7725660dea363;hp=d9502e0ee325eabb1572643657ea321f7d677fb2;hb=5e2e38954c46c4897499e7ce16654e8de5b15b52;hpb=59697a08470e9127ff87469311782e3820e5f07c diff --git a/src/download.php b/src/download.php index d9502e0e..dd0b65aa 100644 --- a/src/download.php +++ b/src/download.php @@ -1,34 +1,32 @@
"; echo "
"; @@ -50,9 +48,13 @@ echo "
"; echo "
"; - if ($type1 != "html") + if ($type1 == 'html') { + $body = MagicHTML( $body, $id ); + } else { translateText($body, $wrap_at, $charset); + } + flush(); echo $body; echo "
"; @@ -72,12 +74,18 @@ $message = getEntity($message, $passed_ent_id); $header = $message->header; - $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); $charset = $header->charset; $type0 = $header->type0; $type1 = $header->type1; + if (isset($override_type0)) + $type0 = $override_type0; + if (isset($override_type1)) + $type1 = $override_type1; $filename = decodeHeader($header->filename); + if (!$filename) { + $filename = decodeHeader($header->name); + } if (strlen($filename) < 1) { if ($type1 == "plain" && $type0 == "text") $suffix = "txt"; @@ -102,52 +110,118 @@ // is displayable (text or html), it will load them up in a text // viewer (built in to squirrelmail). Otherwise, it sets the // content-type as application/octet-stream - - header("Pragma: "); - header("Content-Description: SquirrelMail Attachment"); - if ($absolute_dl == "true") { + + if (isset($absolute_dl) && $absolute_dl == "true") { switch($type0) { case "text": + DumpHeaders($type0, $type1, $filename, 1); + $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); $body = decodeBody($body, $header->encoding); - header("Content-Disposition: attachment; filename=\"$filename\""); - header("Content-type: application/octet-stream; name=\"$filename\""); - set_up_language(getPref($data_dir, $username, "language")); - if ($type1 == "plain") { - echo _("Subject") . ": " . decodeHeader(sqStripSlashes($top_header->subject)) . "\n"; - echo " " . _("From") . ": " . decodeHeader(sqStripSlashes($top_header->from)) . "\n"; - echo " " . _("To") . ": " . decodeHeader(sqStripSlashes(getLineOfAddrs($top_header->to))) . "\n"; + if ($type1 == "plain" && isset($showHeaders)) { + echo _("Subject") . ": " . decodeHeader($top_header->subject) . "\n"; + echo " " . _("From") . ": " . decodeHeader($top_header->from) . "\n"; + echo " " . _("To") . ": " . decodeHeader(getLineOfAddrs($top_header->to)) . "\n"; echo " " . _("Date") . ": " . getLongDateString($top_header->date) . "\n\n"; } - echo trim($body); + elseif ($type1 == "html" && isset($showHeaders)) { + echo '\n\n\n\n
' . _("Subject"); + echo ':' . decodeHeader($top_header->subject); + echo "
" . _("From"); + echo ':' . decodeHeader($top_header->from); + echo "
" . _("To"); + echo ':' . decodeHeader(getLineOfAddrs($top_header->to)); + echo "
" . _("Date"); + echo ':' . getLongDateString($top_header->date); + echo "
\n
\n"; + } + echo $body; break; default: - $body = decodeBody($body, $header->encoding); - header("Content-Disposition: attachment; filename=\"$filename\""); - header("Content-type: application/octet-stream; name=\"$filename\""); - echo $body; + DumpHeaders($type0, $type1, $filename, 1); + mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding); break; } } else { switch ($type0) { case "text": - $body = decodeBody($body, $header->encoding); - include("../functions/page_header.php"); - viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); + if ($type1 == "plain" || $type1 == "html") { + $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); + $body = decodeBody($body, $header->encoding); + viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); + } else { + DumpHeaders($type0, $type1, $filename, 0); + $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); + $body = decodeBody($body, $header->encoding); + echo $body; + } break; case "message": + $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id); $body = decodeBody($body, $header->encoding); - include("../functions/page_header.php"); viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at); break; default: - $body = decodeBody($body, $header->encoding); - header("Content-type: $type0/$type1; name=\"$filename\""); - header("Content-Disposition: attachment; filename=\"$filename\""); - echo $body; + DumpHeaders($type0, $type1, $filename, 0); + mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding); break; } - } - - sqimap_mailbox_close($imapConnection); - sqimap_logout($imapConnection); -?> + } + + + // This function is verified to work with Netscape and the *very latest* + // version of IE. I don't know if it works with Opera, but it should now. + function DumpHeaders($type0, $type1, $filename, $force) + { + global $HTTP_USER_AGENT; + + $isIE = 0; + if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false && + strstr($HTTP_USER_AGENT, 'Opera') === false) { + $isIE = 1; + } + + $filename = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename); + + // A Pox on Microsoft and it's Office! + if (! $force) + { + // Try to show in browser window + header("Content-Disposition: inline; filename=\"$filename\""); + header("Content-Type: $type0/$type1; name=\"$filename\""); + } + else + { + // Try to pop up the "save as" box + // IE makes this hard. It pops up 2 save boxes, or none. + // http://support.microsoft.com/support/kb/articles/Q238/5/88.ASP + // But, accordint to Microsoft, it is "RFC compliant but doesn't + // take into account some deviations that allowed within the + // specification." Doesn't that mean RFC non-compliant? + // http://support.microsoft.com/support/kb/articles/Q258/4/52.ASP + // + // The best thing you can do for IE is to upgrade to the latest + // version + if ($isIE) { + // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp + // Do not have quotes around filename, but that applied to + // "attachment"... does it apply to inline too? + // + // This combination seems to work mostly. IE 5.5 SP 1 has + // known issues (see the Microsoft Knowledge Base) + header("Content-Disposition: inline; filename=$filename"); + + // This works for most types, but doesn't work with Word files + header("Content-Type: application/download; name=\"$filename\""); + + // These are spares, just in case. :-) + //header("Content-Type: $type0/$type1; name=\"$filename\""); + //header("Content-Type: application/x-msdownload; name=\"$filename\""); + //header("Content-Type: application/octet-stream; name=\"$filename\""); + } else { + header("Content-Disposition: attachment; filename=\"$filename\""); + // application/octet-stream forces download for Netscape + header("Content-Type: application/octet-stream; name=\"$filename\""); + } + } + } +?> \ No newline at end of file