Better place for picking up the header.

[squirrelmail.git] / src / download.php

diff --git a/src/download.php b/src/download.php
index 9c6fdd52a4f3300ac71aefbab2f6e0d2cb04fb4e..710bdb6afac6ef283fca481115ac5f1c94f2a1e2 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -66,6 +66,7 @@ if ($ent_id) {
     $type0 = 'message';
     $type1 = 'rfc822';
     $encoding = 'US-ASCII';
+    $header = $message->header;
 }
 
 /*
@@ -90,7 +91,7 @@ if (is_object($message->header->disposition)) {
         $filename = $header->getParameter('name');
     }    
 } else {
-    $filename = $message->header->getParameter('name');
+    $filename = $header->getParameter('name');
 }
 
 $filename = decodeHeader($filename);
@@ -112,7 +113,7 @@ if (strlen($filename) < 1) {
     }
 
     if (strlen($filename) < 1) {
-       $filename = 'untitled'.strip_tags($ent_id).$suffix;
+       $filename = 'untitled'.strip_tags($ent_id).'.'.$suffix;
     } else {
        $filename = "$filename.$suffix";
     }