Changeset 5745 for trunk

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

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)
• expressoMail1_2/js/main.js (modified) (4 diffs)
• expressoMail1_2/js/rich_text_editor.js (modified) (1 diff)
• library/CssToInlineStyles/css_to_inline_styles.php (modified) (1 diff)
• prototype/services/ImapServiceAdapter.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;
 
 

trunk/expressoMail1_2/js/main.js

@@ -1814 +1814 @@
            if (txtarea != null){
                   if (data.body != undefined)
-                    txtarea.value = data.body;
+                    txtarea.value = data.body.replace( new RegExp('<pre>((.\n*)*)</pre>'),'$1');
               if (preferences.use_signature == "1")
             txtarea.value += '\n' + signature;     
@@ -2209 +2209 @@
         input_folder.style.display='none';
         input_folder.name = "folder";
-        input_folder.value = folder;      
+        input_folder.value = folder;
+        
+        var input_type = document.createElement("INPUT");
+        input_type.style.display='none';
+        input_type.name = "type";
+        input_type.value = RichTextEditor.plain[ID] ? 'plain' : 'html';
         
         var uids = document.createElement("INPUT");
@@ -2249 +2254 @@
         form.appendChild(textArea);
         form.appendChild(input_folder);
+        form.appendChild(input_type);
 
         // Implementação do In_Reply_To e References
@@ -3582 +3588 @@
             form.folder = folder_id;
             form.body = RichTextEditor.getData("body_"+border_id);
-            form.attachments = listAttachment(border_id);
+            form.type =  RichTextEditor.plain[border_id] ? 'plain' : 'html';
+            form.attachments = listAttachment(border_id) ;
             form.uidsSave = uidsSave[border_id].toString();
             return( form );

trunk/expressoMail1_2/js/rich_text_editor.js

@@ -226 +226 @@
     
      if(this.plain[id] === true)
-     {
-                 if($('#'+id) !== undefined){
+     {               
+                data =  data.replace( new RegExp('<pre>((.\n*)*)</pre>'),'$1');
+                
+                if($('#'+id) !== undefined){
                         $('#'+id).val(data);
                  if (reply === undefined)       

trunk/library/CssToInlineStyles/css_to_inline_styles.php

@@ -184 +184 @@
         {
                 // remove classes
-                $html = preg_replace('/(\s)+class="(.*)"(\s)+/U', ' ', $html);
-
+                $html = preg_replace('/(\s)+class="([^"])"/U', ' ', $html);
+                
                 // remove IDs
-                $html = preg_replace('/(\s)+id="(.*)"(\s)+/U', ' ', $html);
+                $html = preg_replace('/(\s)+id="([^"])"/U', ' ', $html);
 
                 // return

trunk/prototype/services/ImapServiceAdapter.php

@@ -398 +398 @@
                                 $body = $data['body'];
                                 $body = str_replace("%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' );                                        
 
@@ -420 +420 @@
                                         $mailService->addHeaderField('Disposition-Notification-To', Config::me('mail'));
 
-                                $isHTML = ( ( array_key_exists( 'type', $data ) && in_array( strtolower( $data[ 'type' ] ), array( 'html', 'plain' ) ) ) ? strtolower( $data[ 'type' ] ) != 'plain' : true );
-
+                                $isHTML = ( isset($data['type']) && $data['type'] == 'html' )?  true : false;
+                                                                  
                                 if (!$body) $body = ' ';