added bugfix from 1.0.3cvs

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1157 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index cf5dc575a0fea7258f2c1d9cd3d03f3d4779cda6..bb0f2280e2cb27854277fa2544f86d9b946be0ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ Version 1.1.0 -- DEVELOPMENT
 Version 1.0.3 -- DEVELOPMENT
 ----------------------------
 - Made folder drop-down list consistant in look to the other drop-downs
+- Fixed problem where some attachment filenames would not be displayed
+- Added Finnish help files by Teemu Junnila <teejun@vallcom.com>
 
 Version 1.0.2 -- February 8, 2001 
 ---------------------------------

diff --git a/functions/mime.php b/functions/mime.php
index 91572e55476b3d19e4d12289416fc45bf04d33e2..53ae552cd6123f0487f1d5abdac889d0f5042700 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -28,7 +28,7 @@
       var $encoding = '', $size = 0, $to = array(), $from = '', $date = '';
       var $cc = array(), $bcc = array(), $reply_to = '', $subject = '';
       var $id = 0, $mailbox = '', $description = '', $filename = '';
-      var $entity_id = 0, $message_id = 0;
+      var $entity_id = 0, $message_id = 0, $name = '';
    }
    
    class message {
@@ -568,11 +568,17 @@
          if (!$message->entities) {
             $type0 = strtolower($message->header->type0);
             $type1 = strtolower($message->header->type1);
+            $name = decodeHeader($message->header->name);
             
             if ($message->header->entity_id != $ent_id) {
                $filename = decodeHeader($message->header->filename);
                if (trim($filename) == "") {
-                  $display_filename = "untitled-".$message->header->entity_id;
+                  if (trim($name) == "") { 
+                     $display_filename = "untitled-".$message->header->entity_id; 
+                  } else { 
+                     $display_filename = $name; 
+                     $filename = $name; 
+                  } 
                } else {
                   $display_filename = $filename;
                }

diff --git a/src/download.php b/src/download.php
index af82eff0050c54257850815cadec98330e0bd771..ee1b3da3715e77f43ef5193cd7b97e3b1ba17579 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -87,6 +87,9 @@
    if (isset($override_type1))
        $type1 = $override_type1;
    $filename = decodeHeader($header->filename);
+   if (!$filename) {
+      $filename = decodeHeader($header->name);
+   }
 
    if (strlen($filename) < 1) {
       if ($type1 == "plain" && $type0 == "text")                  $suffix = "txt";