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

Timestamp:

03/16/12 17:33:05 (12 years ago)

Author:

cristiano

Message:

Ticket #2469 - Trocada regex que limpa o css e problemas com envio de email em text/plain

File:

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

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

@@ -2759 +2759 @@
                 $body = mb_ereg_replace('<!--\[', '<!-- [', $params['body']);
                 $body = str_replace("%nbsp;","&nbsp;",$body);
-                $body = preg_replace("/\n/"," ",$body);
-                $body = preg_replace("/\r/","" ,$body);
+                //$body = preg_replace("/\n/"," ",$body);
+                //$body = preg_replace("/\r/","" ,$body);
                 $body = html_entity_decode ( $body, ENT_QUOTES , 'ISO-8859-1' );        
             }
@@ -2843 +2843 @@
 
             $mailService->setSubject($subject);
-            $isHTML = ( (array_key_exists('type', $params) && in_array(strtolower($params['type']), array('html', 'plain')) ) ?
-                            strtolower($params['type']) != 'plain' : true );
+            $isHTML = ( isset($params['type']) && $params['type'] == 'html' )?  true : false;