Bugfixes mime class. (Like I mentioned in the mail Paul)

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

diff --git a/class/mime.class.php b/class/mime.class.php
index 2e1cdef3a784e8292dcb434990fed95346994854..dd2eec539f39dbf9fbe0c83aa786dc14ec49ccff 100644 (file)
--- a/class/mime.class.php
+++ b/class/mime.class.php
@@ -853,7 +853,7 @@ 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;
                         $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;
+//                        $arg_no = 0;

                         ++$i;
                         if ((substr($msg->entity_id, -2) == '.0') && ($msg->type0 !='multipart')) {
                            $msg->entity_id++;
                         ++$i;
                         if ((substr($msg->entity_id, -2) == '.0') && ($msg->type0 !='multipart')) {
                            $msg->entity_id++;


@@ -863,9 +863,9 @@ class message {
                         $hdr->type1 = $arg_a[0];
                         $msg->type0 = 'multipart';
                         $msg->type1 = $arg_a[0];
                         $hdr->type1 = $arg_a[0];
                         $msg->type0 = 'multipart';
                         $msg->type1 = $arg_a[0];

-                        $hdr->parameters = (is_array($arg_a[1]) ? $arg_a[1] : $hdr->parameters);
-                        $hdr->disposition = (is_array($arg_a[2]) ? $arg_a[2] : $hdr->disposition);
-                        $hdr->language = (is_array($arg_a[3]) ? $arg_a[3] : $hdr->language);
+                        $hdr->parameters = (isset($arg_a[1]) ? $arg_a[1] : $hdr->parameters);
+                        $hdr->disposition = (isset($arg_a[2]) ? $arg_a[2] : $hdr->disposition);
+                        $hdr->language = (isset($arg_a[3]) ? $arg_a[3] : $hdr->language);

                         $msg->header = $hdr;
                     }
                     return (array($msg, $i));
                         $msg->header = $hdr;
                     }
                     return (array($msg, $i));