Changeset 5763 for trunk

Timestamp:

03/20/12 15:35:13 (12 years ago)

Author:

cristiano

Message:

Ticket #2497 - Correção de codificação incorreta

Location:

trunk

Files:

• expressoMail1_2/js/main.js (modified) (4 diffs)
• prototype/services/ImapServiceAdapter.php (modified) (3 diffs)

trunk/expressoMail1_2/js/main.js

@@ -1813 +1813 @@
            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.name = "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");
         uids.style.display='none';
@@ -2248 +2253 @@
         form.appendChild(textArea);
         form.appendChild(input_folder);
-
+        form.appendChild(input_type);
         // Implementação do In_Reply_To e References
         var msgId = document.createElement("INPUT");
@@ -3581 +3586 @@
             form.folder = folder_id;
             form.body = RichTextEditor.getData("body_"+border_id);
+            form.type =  RichTextEditor.plain[border_id] ? 'plain' : 'html';        
             form.attachments = listAttachment(border_id);
             form.uidsSave = uidsSave[border_id].toString();

trunk/prototype/services/ImapServiceAdapter.php

@@ -417 +417 @@
                                 $GLOBALS['phpgw_info']['flags'] = array( 'noheader' => true, 'nonavbar' => true,'currentapp' => 'expressoMail1_2','enable_nextmatchs_class' => True );
                                 $return = array();
-
+                                
                                 require_once dirname(__FILE__) . '/../../services/class.servicelocator.php';
                                 $mailService = ServiceLocator::getService('mail');
@@ -424 +424 @@
                                 $body = $data['body'];
                                 $body = str_replace("%nbsp;"," ",$body);
-                                //$body = preg_replace("/\n/"," ",$body);
-                                //$body = preg_replace("/\r/","" ,$body);
                                 $body = html_entity_decode ( $body, ENT_QUOTES , 'ISO-8859-1' );                                        
 
@@ -431 +429 @@
                                 $folder = @eregi_replace("INBOX[/.]", "INBOX".$this->imap_delimiter, $folder);
 
-                                                                /**
-                                                                 * Gera e preenche o field Message-Id do header
-                                                                 */
-                                                                $mailService->addHeaderField('Message-Id', UUID::generate( UUID::UUID_RANDOM, UUID::FMT_STRING ) . '@Draft');
+                                /**
+                                 * Gera e preenche o field Message-Id do header
+                                 */
+                                $mailService->addHeaderField('Message-Id', UUID::generate( UUID::UUID_RANDOM, UUID::FMT_STRING ) . '@Draft');
                                                                 
-                                $mailService->addTo($data['input_to']);
-                                $mailService->addCc( $data['input_cc']);
-                                $mailService->addBcc($data['input_cco']);
-                                $mailService->setSubject($data['input_subject']);
+                                $mailService->addTo(mb_convert_encoding(($data['input_to']), 'ISO-8859-1', 'UTF-8,ISO-8859-1'));
+                                $mailService->addCc( mb_convert_encoding(($data['input_cc']), 'ISO-8859-1', 'UTF-8,ISO-8859-1'));
+                                $mailService->addBcc(mb_convert_encoding(($data['input_cco']), 'ISO-8859-1', 'UTF-8,ISO-8859-1'));
+                                $mailService->setSubject(mb_convert_encoding(($data['input_subject']), 'ISO-8859-1', 'UTF-8,ISO-8859-1'));
+                                
                                 if(isset($data['input_important_message']))
                                         $mailService->addHeaderField('Importance','High');