Changeset 5763
- Timestamp:
- 03/20/12 15:35:13 (12 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r5754 r5763 1813 1813 if (txtarea != null){ 1814 1814 if (data.body != undefined) 1815 txtarea.value = data.body ;1815 txtarea.value = data.body.replace( new RegExp('<pre>((.\n*)*)</pre>'),'$1'); 1816 1816 if (preferences.use_signature == "1") 1817 1817 txtarea.value += '\n' + signature; … … 2209 2209 input_folder.name = "folder"; 2210 2210 input_folder.value = folder; 2211 2211 2212 var input_type = document.createElement("INPUT"); 2213 input_type.style.display='none'; 2214 input_type.name = "type"; 2215 input_type.value = RichTextEditor.plain[ID] ? 'plain' : 'html'; 2216 2212 2217 var uids = document.createElement("INPUT"); 2213 2218 uids.style.display='none'; … … 2248 2253 form.appendChild(textArea); 2249 2254 form.appendChild(input_folder); 2250 2255 form.appendChild(input_type); 2251 2256 // Implementação do In_Reply_To e References 2252 2257 var msgId = document.createElement("INPUT"); … … 3581 3586 form.folder = folder_id; 3582 3587 form.body = RichTextEditor.getData("body_"+border_id); 3588 form.type = RichTextEditor.plain[border_id] ? 'plain' : 'html'; 3583 3589 form.attachments = listAttachment(border_id); 3584 3590 form.uidsSave = uidsSave[border_id].toString(); -
trunk/prototype/services/ImapServiceAdapter.php
r5749 r5763 417 417 $GLOBALS['phpgw_info']['flags'] = array( 'noheader' => true, 'nonavbar' => true,'currentapp' => 'expressoMail1_2','enable_nextmatchs_class' => True ); 418 418 $return = array(); 419 419 420 420 require_once dirname(__FILE__) . '/../../services/class.servicelocator.php'; 421 421 $mailService = ServiceLocator::getService('mail'); … … 424 424 $body = $data['body']; 425 425 $body = str_replace("%nbsp;"," ",$body); 426 //$body = preg_replace("/\n/"," ",$body);427 //$body = preg_replace("/\r/","" ,$body);428 426 $body = html_entity_decode ( $body, ENT_QUOTES , 'ISO-8859-1' ); 429 427 … … 431 429 $folder = @eregi_replace("INBOX[/.]", "INBOX".$this->imap_delimiter, $folder); 432 430 433 434 435 436 431 /** 432 * Gera e preenche o field Message-Id do header 433 */ 434 $mailService->addHeaderField('Message-Id', UUID::generate( UUID::UUID_RANDOM, UUID::FMT_STRING ) . '@Draft'); 437 435 438 $mailService->addTo($data['input_to']); 439 $mailService->addCc( $data['input_cc']); 440 $mailService->addBcc($data['input_cco']); 441 $mailService->setSubject($data['input_subject']); 436 $mailService->addTo(mb_convert_encoding(($data['input_to']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 437 $mailService->addCc( mb_convert_encoding(($data['input_cc']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 438 $mailService->addBcc(mb_convert_encoding(($data['input_cco']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 439 $mailService->setSubject(mb_convert_encoding(($data['input_subject']), 'ISO-8859-1', 'UTF-8,ISO-8859-1')); 440 442 441 if(isset($data['input_important_message'])) 443 442 $mailService->addHeaderField('Importance','High');
Note: See TracChangeset
for help on using the changeset viewer.