projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo
[squirrelmail.git]
/
src
/
download.php
diff --git
a/src/download.php
b/src/download.php
index b14cfd8f7d9a9d86d5efa23bfbb32772c95f3955..bdd2a23c3b45448b5bebc8d64ef4735eceb0715a 100644
(file)
--- a/
src/download.php
+++ b/
src/download.php
@@
-3,17
+3,20
@@
/**
* download.php
*
/**
* download.php
*
- * Copyright (c) 1999-200
3
The SquirrelMail Project Team
+ * Copyright (c) 1999-200
4
The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Handles attachment downloads to the users computer.
* Also allows displaying of attachments when possible.
*
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Handles attachment downloads to the users computer.
* Also allows displaying of attachments when possible.
*
- * $Id$
+ *
@version
$Id$
* @package squirrelmail
*/
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@
-38,8
+41,6
@@
if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
/* end globals */
/* end globals */
-global $uid_support;
-
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
@@
-93,29
+94,25
@@
if (is_object($message->header->disposition)) {
$filename = $header->getParameter('name');
}
$filename = $header->getParameter('name');
}
+//$filename = decodeHeader($filename, false, false); //Don't want html output nor utf8 because it will return html output
$filename = decodeHeader($filename, true, false); //Don't want html output
if (strlen($filename) < 1) {
$filename = decodeHeader($filename, true, false); //Don't want html output
if (strlen($filename) < 1) {
- if ($type1 == 'plain' && $type0 == 'text') {
+ //$filename = decodeHeader($subject, false, false); //Don't want html output nor utf8 because it will return html output
+ $filename = decodeHeader($subject, true, false); //Don't want html output
+ if ($type1 == 'plain' && $type0 == 'text')
$suffix = 'txt';
$suffix = 'txt';
- $filename = $subject . '.txt';
- } else if ($type1 == 'richtext' && $type0 == 'text') {
+ else if ($type1 == 'richtext' && $type0 == 'text')
$suffix = 'rtf';
$suffix = 'rtf';
- $filename = $subject . '.rtf';
- } else if ($type1 == 'postscript' && $type0 == 'application') {
+ else if ($type1 == 'postscript' && $type0 == 'application')
$suffix = 'ps';
$suffix = 'ps';
- $filename = $subject . '.ps';
- } else if ($type1 == 'rfc822' && $type0 == 'message') {
- $suffix = 'eml';
- $filename = $subject . '.msg';
- } else {
+ else if ($type1 == 'rfc822' && $type0 == 'message')
+ $suffix = 'msg';
+ else
$suffix = $type1;
$suffix = $type1;
- }
- if (strlen($filename) < 1) {
- $filename = 'untitled'.strip_tags($ent_id).'.'.$suffix;
- } else {
- $filename = "$filename.$suffix";
- }
+ if ($filename == '')
+ $filename = 'untitled' . strip_tags($ent_id);
+ $filename = $filename . '.' . $suffix;
}
/*
}
/*