Changeset 7686 for trunk/zpush/backend/expresso/providers
- Timestamp:
- 12/20/12 18:09:47 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zpush/backend/expresso/providers/imapProvider.php
r7671 r7686 1027 1027 $message = $mobj->decode(array('decode_headers' => true, 'decode_bodies' => true, 'include_bodies' => true, 'charset' => 'utf-8')); 1028 1028 1029 1030 1031 1029 1032 /* BEGIN fmbiete's contribution r1528, ZP-320 */ 1030 1033 $output = new SyncMail(); … … 1598 1601 protected function getBodyRecursive($message, $subtype, &$body) { 1599 1602 if(!isset($message->ctype_primary)) return; 1600 if(strcasecmp($message->ctype_primary,"text")==0 && strcasecmp($message->ctype_secondary,$subtype)==0 && isset($message->body)) 1601 $body .= $message->body; 1603 if(strcasecmp($message->ctype_primary,"text")==0 && strcasecmp($message->ctype_secondary,$subtype)==0 && isset($message->body)){ 1604 $body .= (strtolower($message->ctype_parameters['charset']) == 'iso-8859-1' ) ? mb_convert_encoding($message->body, "UTF-8","ISO-8859-1,UTF-8") : $message->body; 1605 } 1602 1606 1603 1607 if(strcasecmp($message->ctype_primary,"multipart")==0 && isset($message->parts) && is_array($message->parts)) {
Note: See TracChangeset
for help on using the changeset viewer.