$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";
// 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 (isset($absolute_dl) && $absolute_dl == "true") {
switch($type0) {
case "text":
$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"));
+ header("Content-Disposition: attachment; filename=\"$filename\"");
+ header("Content-type: application/octet-stream; name=\"$filename\"");
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";
+ 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);
break;
default:
- header("Content-Disposition: attachment; filename=$filename");
- header("Content-type: application/octet-stream; name=$filename");
+ header("Content-Disposition: inline; filename=\"$filename\"");
+ header("Content-type: application/download; name=\"$filename\"");
mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding);
break;
}
} else {
$body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
$body = decodeBody($body, $header->encoding);
- header("Content-type: $type0/$type1; name=$filename");
- header("Content-Disposition: attachment; filename=$filename");
+ header("Content-type: $type0/$type1; name=\"$filename\"");
+ header("Content-Disposition: inline; filename=\"$filename\"");
echo $body;
}
break;
break;
default:
header("Content-type: $type0/$type1; name=\"$filename\"");
- header("Content-Disposition: attachment; filename=\"$filename\"");
+ header("Content-Disposition: inline; filename=\"$filename\"");
mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding);
break;
}