Changeset 4887 for trunk/expressoMail1_2

Timestamp:

08/02/11 09:50:18 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - Mensagem assinada não abre no ExpressoMail?.r4869

File:

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

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

@@ -1199 +1199 @@
             switch (strtolower($structure->ctype_primary))
                 {
-                case 'text':
-                        if(strtolower($structure->ctype_secondary) == 'x-pkcs7-mime')
-                        {
+                        if((preg_match("/pkcs7-mime/i", $msg->structure[$msg_number]->subtype) == 1) && (count($return['signature']) == 0 ) ){
                                 $return['body']='isCripted';
                                 return $return;
@@ -1210 +1208 @@
                         $disposition = strtolower($structure->disposition);
 
-                        if(($msg_subtype == "html" || $msg_subtype == 'plain') && ($disposition != 'attachment'))
+                        if (preg_match("/pkcs7-mime/i", $msg->structure[$msg_number]->subtype) == 1)
                         {
 
@@ -2294 +2292 @@
                                 if( $allow ) 
                                 { 
-                                    $this->add_recipients("cco", $ccoaddress, &$mail); 
+                $this->add_recipients("cco", $ccoaddress, &$mail);
                                 }
                 $mail->AddReplyTo($replytoaddress);
@@ -4179 +4177 @@
     }
 
-    function show_decript($params){
+    function show_decript($params,$dec=0){
         $source = $params['source'];
-        //error_log("source: $source\nversao: " . PHP_VERSION, 3, '/tmp/teste.log');
-        $source = str_replace(" ", "+", $source,$i);
-
-        if (version_compare(PHP_VERSION, '5.2.0', '>=')){
-            if(!$source = base64_decode($source,true))
-                return "error ".$source."Espaços ".$i;
-
-        }
-        else {
-            if(!$source = base64_decode($source))
-                return "error ".$source."Espaços ".$i;
+        //error_log("source: $source\nversao: " . PHP_VERSION);
+
+        if ($dec == 0)
+        {
+            $source = str_replace(" ", "+", $source,$i);
+            if (version_compare(PHP_VERSION, '5.2.0', '>=')){
+                if(!$source = base64_decode($source,true))
+                    return "error ".$source."Espaï¿œos ".$i;
+
+            }
+            else {
+                if(!$source = base64_decode($source))
+                    return "error ".$source."Espaï¿œos ".$i;
+            }
+
         }