Changeset 13 for trunk/expressoMail1_2/inc/class.message_components.inc.php

Timestamp:

04/10/07 10:21:10 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/expressoMail1_2/inc/class.message_components.inc.php (modified) (5 diffs)

trunk/expressoMail1_2/inc/class.message_components.inc.php

@@ -127 +127 @@
                                                 $this->charset[$mid][$n]   = $charset;
                         $this->fsize[$mid][$n]     = (!isset($parts[$p]->bytes) || empty($parts[$p]->bytes))? 0 : $parts[$p]->bytes;
-
+                                                $hasAttachment = false;
                         # Force inline disposition if none is present
                         //if ($parts[$p]->ifdisposition == true)
@@ -144 +144 @@
                                         {
                                             $this->fname[$mid][$n] = $param->value;
+                                            $hasAttachment = true;
                                             break;
-                                        }
+                                        }                                        
                                     }
                                 }
                                 
                                 // Alguns web-mails utilizam o parameters
-                                if ($parts[$p]->ifparameters == true)
+                                if ($parts[$p]->ifparameters == true && !$hasAttachment)
                                 {
                                     $params = $parts[$p]->parameters;
@@ -170 +171 @@
                                         if(strtolower($param->attribute) == 'charset'){
                                                 if($this->charset[$mid][$n] == '')
-                                                        $this->charset[$mid][$n] = $param->value;
+                                                        $this->charset[$mid][$n] = $param->value;                                               
                                         }
                                     }
@@ -224 +225 @@
                 }
                 
-                $this->encoding[$mid][0]                = $this->encoding_types[$this->structure[$mid]->encoding];
+                $this->encoding[$mid][0]              = $this->encoding_types[$this->structure[$mid]->encoding];
                 if(!preg_match("/5./",phpversion()))
                                         $this->charset[$mid][0] = $this->structure[$mid]->parameters[0]->value;
@@ -250 +251 @@
                                         }
                                 }
+                                if (isset($this->structure[$mid]->ifparameters))
+                                {
+                                        $params = $this->structure[$mid]->parameters;
+                                        $n = 0;
+                                        if($params)
+                                        foreach ($params as $param)
+                                        {
+                                                if(strtolower($param->attribute) == 'charset'){
+                                if($this->charset[$mid][$n] == '')
+                                $this->charset[$mid][$n] = $param->value;
+                        }
+                                                $n++;
+                                        }
+                                }
                                 $this->disposition[$mid][0] = $this->structure[$mid]->disposition;
                 //$this->disposition[$mid][0] = 'inline';