finally managed to solve the bad Junk after literal output from the

[squirrelmail.git] / class / mime.class.php

diff --git a/class/mime.class.php b/class/mime.class.php
index f18b90266c64c56c7d54a003446de606e882c6c1..f6ae0d74c328a68d674ef0c5b5e1f344064837e7 100644 (file)
--- a/class/mime.class.php
+++ b/class/mime.class.php
@@ -554,13 +554,11 @@ class message {
 
     function getFilename() {
         $filename = '';
-
-        if (is_object($this->header->disposition)) {
-            $filename = $this->header->disposition->getproperty('filename');
-            if (!$filename) {
-                $filename = $this->header->disposition->getproperty('name');
-            }
+        $filename = $this->header->getParameter('filename');   
+        if (!$filename) {
+            $filename = $this->header->getParameter('name');
         }
+
         if (!$filename) {
             $filename = 'untitled-'.$this->entity_id;
         }
@@ -837,7 +835,6 @@ class message {
 
                         $msg->type0 = $arg_a[0];
                         $msg->type1 = $arg_a[1];
-
                         $arr = $arg_a[2];
                         if (is_array($arr)) {
                             $hdr->parameters = $arg_a[2];
@@ -857,10 +854,8 @@ class message {
                         $hdr->disposition = (isset($arg_a[8+$s]) ? $arg_a[8+$s] : $hdr->disposition);
                         $hdr->language = (isset($arg_a[9+$s]) ? $arg_a[9+$s] : $hdr->language);
                         $msg->header = $hdr;
-//                        $arg_no = 0;
-                        ++$i;
-                        if ((substr($msg->entity_id, -2) == '.0') && ($msg->type0 !='multipart')) {
-                           $msg->entity_id++;
+                        if ((strrchr($msg->entity_id, '.') == '.0') && ($msg->type0 !='multipart')) {
+                           $msg->entity_id = $this->entity_id . '.1';
                         }
                     } else {
                         $hdr->type0 = 'multipart';
@@ -872,6 +867,7 @@ class message {
                         $hdr->language = (isset($arg_a[3]) ? $arg_a[3] : $hdr->language);
                         $msg->header = $hdr;
                     }
+                    ++$i;
                     return (array($msg, $i));
                 default: break;
             } /* switch */
@@ -905,7 +901,6 @@ class message {
                 }
             }
         }
-
         return array($properties, $i);
     }