Changeset 7292 for branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

09/25/12 08:47:16 (12 years ago)

Author:

eduardow

Message:

Ticket #3126 - Mensagens encaminhadas ficando em branco.

File:

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

branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -2684 +2684 @@
             }
 
+            if (substr($params['input_to'], -1) == ',') 
+                $params['input_to'] = substr($params['input_to'], 0, -1); 
+ 
+            if (substr($params['input_cc'], -1) == ',') 
+                $params['input_cc'] = substr($params['input_cc'], 0, -1); 
+ 
+            if (substr($params['input_cco'], -1) == ',') 
+                $params['input_cco'] = substr($params['input_cco'], 0, -1); 
+
             /*Wraps the text dividing the emails as from ">,"*/
             $toaddress = $db->getAddrs(preg_split('/>,/',preg_replace('/>,/', '>>,', $params['input_to'])));
@@ -2720 +2729 @@
             $message_attachments = $params['message_attachments'];
 
-            if (substr($params['input_to'], -1) == ',')
-                $params['input_to'] = substr($params['input_to'], 0, -1);
-
-            if (substr($params['input_cc'], -1) == ',')
-                $params['input_cc'] = substr($params['input_cc'], 0, -1);
-
-            if (substr($params['input_cco'], -1) == ',')
-                $params['input_cco'] = substr($params['input_cco'], 0, -1);
 
             // Valida numero Maximo de Destinatarios 
@@ -2844 +2845 @@
             } else {
                 //Compatibilização com Outlook, ao encaminhar a mensagem
-                $body = mb_ereg_replace('<!--\[', '<!-- [', $params['body']);                            
+                $body = mb_ereg_replace('<!--\[', '<!-- [', base64_decode($params['body']));                            
                 $body = str_replace("&lt;","&yzwkx;",$body); //Alterar as Entities padrão das tags < > para compatibilizar com o Expresso 
                 $body = str_replace("&gt;","&xzwky;",$body);
@@ -3026 +3027 @@
 
             $attachment = json_decode($params['attachments'],TRUE);
-
-            foreach ($attachment as &$value) 
+            $message_size_total = 0;
+            foreach ($attachment as &$value)
             {
                 if((int)$value > 0) //BD attachment