projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Bugfix from Albert Novak <anovak@pu.carnet.hr>
[squirrelmail.git]
/
src
/
download.php
diff --git
a/src/download.php
b/src/download.php
index ced450fe18ed38c7a53750985b1dae35fa0cc70a..ee1b3da3715e77f43ef5193cd7b97e3b1ba17579 100644
(file)
--- a/
src/download.php
+++ b/
src/download.php
@@
-7,12
+7,14
@@
**
** Handles attachment downloads to the users computer.
** Also allows displaying of attachments when possible.
**
** Handles attachment downloads to the users computer.
** Also allows displaying of attachments when possible.
+ **
+ ** $Id$
**/
**/
- if (!isset($config_php))
- include("../config/config.php");
if (!isset($strings_php))
include("../functions/strings.php");
if (!isset($strings_php))
include("../functions/strings.php");
+ if (!isset($config_php))
+ include("../config/config.php");
if (!isset($imap_php))
include("../functions/imap.php");
if (!isset($mime_php))
if (!isset($imap_php))
include("../functions/imap.php");
if (!isset($mime_php))
@@
-22,6
+24,10
@@
if (!isset($i18n_php))
include("../functions/i18n.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
+ session_start();
+ header("Pragma: ");
+ header("Cache-Control: cache");
+
include("../src/load_prefs.php");
function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
include("../src/load_prefs.php");
function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
@@
-76,7
+82,14
@@
$charset = $header->charset;
$type0 = $header->type0;
$type1 = $header->type1;
$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);
$filename = decodeHeader($header->filename);
+ if (!$filename) {
+ $filename = decodeHeader($header->name);
+ }
if (strlen($filename) < 1) {
if ($type1 == "plain" && $type0 == "text") $suffix = "txt";
if (strlen($filename) < 1) {
if ($type1 == "plain" && $type0 == "text") $suffix = "txt";
@@
-101,27
+114,25
@@
// 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
// 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":
$body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
$body = decodeBody($body, $header->encoding);
switch($type0) {
case "text":
$body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
$body = decodeBody($body, $header->encoding);
- header("Content-Disposition: filename=\"$filename\"");
+ 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") {
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";
+ 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:
echo " " . _("Date") . ": " . getLongDateString($top_header->date) . "\n\n";
}
echo trim($body);
break;
default:
- header("Content-Disposition:
filename=$filename
");
+ header("Content-Disposition:
attachment; filename=\"$filename\"
");
header("Content-type: application/octet-stream; name=\"$filename\"");
mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding);
break;
header("Content-type: application/octet-stream; name=\"$filename\"");
mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding);
break;
@@
-138,7
+149,7
@@
$body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
$body = decodeBody($body, $header->encoding);
header("Content-type: $type0/$type1; name=\"$filename\"");
$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: filename=\"$filename\"");
+ header("Content-Disposition:
attachment;
filename=\"$filename\"");
echo $body;
}
break;
echo $body;
}
break;
@@
-150,7
+161,7
@@
break;
default:
header("Content-type: $type0/$type1; name=\"$filename\"");
break;
default:
header("Content-type: $type0/$type1; name=\"$filename\"");
- header("Content-Disposition: filename=\"$filename\"");
+ header("Content-Disposition:
attachment;
filename=\"$filename\"");
mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding);
break;
}
mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding);
break;
}