Changeset 5172 for trunk/expressoMail1_2/inc/class.attachment.inc.php

Timestamp:

11/11/11 16:42:49 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus. Ultimas sincronizacoes...

File:

• trunk/expressoMail1_2/inc/class.attachment.inc.php (modified) (2 diffs)

trunk/expressoMail1_2/inc/class.attachment.inc.php

@@ -363 +363 @@
                  
                             //Attachments com nomes grandes são quebrados em varias partes VER RFC2231
-                            if( !$name && isset($structure->disposition) && (strtolower($structure->disposition) === 'attachment' || strtolower($structure->ctype_primary) == 'image'))
+                            if( !$name && isset($structure->disposition) && (strtolower($structure->disposition) === 'attachment' || strtolower($structure->ctype_primary) == 'image' ||  strtolower($structure->ctype_primary.'/'.$structure->ctype_secondary) == 'application/octet-stream'))
                                         foreach ($structure->d_parameters as $i => $v)
                                                 if(strpos($i , 'filename') !== false)
                                                         $name .= urldecode(str_ireplace(array('ISO-8859-1','UTF-8','US-ASCII'),'',$v));
-                             if( !$name && isset($structure->disposition) && (strtolower($structure->disposition) === 'attachment' || strtolower($structure->ctype_primary) == 'image') )
+                             if( !$name && isset($structure->disposition) && (strtolower($structure->disposition) === 'attachment' || strtolower($structure->ctype_primary) == 'image' ||  strtolower($structure->ctype_primary.'/'.$structure->ctype_secondary) == 'application/octet-stream') )
                                         foreach ($structure->ctype_parameters as $i => $v)
                                                 if(strpos($i , 'name') !== false)
@@ -439 +439 @@
                          $name = $part->ctype_parameters['name'];
 
+                     //Attachments com nomes grandes são quebrados em varias partes VER RFC2231
+                        if( !$name && isset($part->disposition) && (strtolower($part->disposition) === 'attachment' || strtolower($part->ctype_primary) == 'image' ||  strtolower($part->ctype_primary.'/'.$part->ctype_secondary) == 'application/octet-stream') )
+                                    foreach ($part->d_parameters as $i => $v)
+                                            if(strpos($i , 'filename') !== false)
+                                                    $name .= urldecode(str_ireplace(array('ISO-8859-1','UTF-8','US-ASCII'),'',$v));
+                         if( !$name && isset($part->disposition) && (strtolower($part->disposition) === 'attachment' || strtolower($part->ctype_primary) == 'image' ||  strtolower($part->ctype_primary.'/'.$part->ctype_secondary) == 'application/octet-stream') )
+                                    foreach ($part->ctype_parameters as $i => $v)
+                                            if(strpos($i , 'name') !== false)
+                                                    $name .= urldecode(str_ireplace(array('ISO-8859-1','UTF-8','US-ASCII'),'',$v));             
+                       ////////////////////////////////////////////////////////////////////////////////////
+                    
                     if($name && (strlen($name) - (strrpos($name, '.')+1) === 3 )) 
                         $ext = strtolower(substr ( $name , (strrpos($name, '.')+1) ));