Changeset 5763 for trunk/prototype/services/ImapServiceAdapter.php
- Timestamp:
- 03/20/12 15:35:13 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
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.