Added images used for $advanced_tree=true in src/left_main.php

[squirrelmail.git] / src / download.php

diff --git a/src/download.php b/src/download.php
index 9c6fdd52a4f3300ac71aefbab2f6e0d2cb04fb4e..323c52172677e5cf8c2f9af6264a19dbebd8ec9d 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -53,10 +53,8 @@ if ($ent_id) {
     
     if ($message->rfc822_header) {
        $subject = $message->rfc822_header->subject;
-       $charset = $header->content_type->properties['charset'];
     } else {
        $header = $message->header;
-       $charset = $header->getParameter('charset');
     }
     $type0 = $header->type0;
     $type1 = $header->type1;
@@ -66,6 +64,7 @@ if ($ent_id) {
     $type0 = 'message';
     $type1 = 'rfc822';
     $encoding = 'US-ASCII';
+    $header = $message->header;
 }
 
 /*
@@ -84,35 +83,35 @@ $filename = '';
 if (is_object($message->header->disposition)) {
     $filename = $header->disposition->getProperty('filename');
     if (!$filename) {
-       $filename = $header->disposition->getProperty('name');
+        $filename = $header->disposition->getProperty('name');
     }
     if (!$filename) {
         $filename = $header->getParameter('name');
     }    
 } else {
-    $filename = $message->header->getParameter('name');
+    $filename = $header->getParameter('name');
 }
 
 $filename = decodeHeader($filename);
 if (strlen($filename) < 1) {
     if ($type1 == 'plain' && $type0 == 'text') {
         $suffix = 'txt';
-       $filename = $subject . '.txt';
+        $filename = $subject . '.txt';
     } else if ($type1 == 'richtext' && $type0 == 'text') {
         $suffix = 'rtf';
-       $filename = $subject . '.rtf';
+        $filename = $subject . '.rtf';
     } else if ($type1 == 'postscript' && $type0 == 'application') {
         $suffix = 'ps';
-       $filename = $subject . '.ps';
+        $filename = $subject . '.ps';
     } else if ($type1 == 'rfc822' && $type0 == 'message') {
         $suffix = 'eml';
-       $filename = $subject . '.msg';
+        $filename = $subject . '.msg';
     } else {
         $suffix = $type1;
     }
 
     if (strlen($filename) < 1) {
-       $filename = 'untitled'.strip_tags($ent_id).$suffix;
+       $filename = 'untitled'.strip_tags($ent_id).'.'.$suffix;
     } else {
        $filename = "$filename.$suffix";
     }