summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
83cf04b)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6262
7612ce4b-ef26-0410-bec9-
ea0150e637f0
$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 = $subject;
+ if ($type1 == 'plain' && $type0 == 'text')
- $filename = $subject . '.txt';
- } else if ($type1 == 'richtext' && $type0 == 'text') {
+ else if ($type1 == 'richtext' && $type0 == 'text')
- $filename = $subject . '.rtf';
- } else if ($type1 == 'postscript' && $type0 == 'application') {
+ else if ($type1 == 'postscript' && $type0 == 'application')
- $filename = $subject . '.ps';
- } else if ($type1 == 'rfc822' && $type0 == 'message') {
- $suffix = 'eml';
- $filename = $subject . '.msg';
- } else {
+ else if ($type1 == 'rfc822' && $type0 == 'message')
+ $suffix = 'msg';
+ else {
+ $filename = 'untitled' . strip_tags($ent_id);
-
- if (strlen($filename) < 1) {
- $filename = 'untitled'.strip_tags($ent_id).'.'.$suffix;
- } else {
- $filename = "$filename.$suffix";
- }
+ $filename = $filename . '.' . $suffix;