Changeset 4908 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

08/08/11 10:09:08 (13 years ago)

Author:

airton

Message:

Ticket #1820 - Sincronizar o branch 2.2.0.1 para 2.2.0.2

File:

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

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1199 +1199 @@
             switch (strtolower($structure->ctype_primary))
                 {
-                        if((preg_match("/pkcs7-mime/i", $msg->structure[$msg_number]->subtype) == 1) && (count($return['signature']) == 0 ) ){
+                        case 'text': 
+                                        if(strtolower($structure->ctype_secondary) == 'x-pkcs7-mime') 
+                                        {
                                 $return['body']='isCripted';
                                 return $return;
@@ -1208 +1210 @@
                         $disposition = strtolower($structure->disposition);
 
-                        if (preg_match("/pkcs7-mime/i", $msg->structure[$msg_number]->subtype) == 1)
+                        if(($msg_subtype == "html" || $msg_subtype == 'plain') && ($disposition != 'attachment'))
                         {