Selaa lähdekoodia

added bugfix from 1.0.3cvs

Luke Ehresman 24 vuotta sitten
vanhempi
commit
62af2e04a4
3 muutettua tiedostoa jossa 13 lisäystä ja 2 poistoa
  1. 2 0
      ChangeLog
  2. 8 2
      functions/mime.php
  3. 3 0
      src/download.php

+ 2 - 0
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 
 ---------------------------------

+ 8 - 2
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;
                }

+ 3 - 0
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";