Changeset 2037 for trunk/expressoMail1_2
- Timestamp:
- 02/22/10 11:07:25 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r2022 r2037 789 789 if(!$msg->structure[$msg_number]->parts) //Simple message, only 1 piece 790 790 { 791 792 793 794 791 if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){ 792 $return['body']='isCripted'; 793 return $return; 794 } 795 795 796 796 $attachment = array(); //No attachments 797 797 798 if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){ 799 $return['body']='isCripted'; 800 return $return; 801 } 802 803 $content = ''; 804 if (strtolower($msg->structure[$msg_number]->subtype) == "plain") 798 if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){ 799 $return['body']='isCripted'; 800 return $return; 801 } 802 803 $content = $this->decodeBody( 804 imap_body( $this -> mbox, $msg_number, FT_UID ), 805 $msg -> encoding[ $msg_number ][ 0 ], 806 $msg -> charset[ $msg_number ][ 0 ] 807 ); 808 809 if ( strtolower( $msg -> structure[ $msg_number ] -> subtype ) == 'plain' ) 805 810 { 806 $content .= '<span style="font-family: monospace">' . nl2br($this->decodeBody((imap_body($this->mbox, $msg_number, FT_UID)), $msg->encoding[$msg_number][0], $msg->charset[$msg_number][0])) . '</span>'; 807 } 808 else if (strtolower($msg->structure[$msg_number]->subtype) == "html") 809 { 810 $content .= $this->decodeBody(imap_body($this->mbox, $msg_number, FT_UID), $msg->encoding[$msg_number][0], $msg->charset[$msg_number][0]); 811 $content = str_replace( array( '<', '>' ), array( '#$<$# ', ' #$>$#' ), $content ); 812 $content = nl2br( htmlentities( $content ) ); 813 $content = '<span style="font-family: monospace">' . $content . '</span>'; 814 $content = $this -> replace_links( $content ); 815 $content = str_replace( array( '#$<$# ', ' #$>$#' ), array( '<', '>' ), $content ); 816 817 $return[ 'body' ] = $content; 818 819 return $return; 811 820 } 812 821 } … … 928 937 $params = array('folder' => $msg_folder, "msgs_to_set" => $msg_number, "flag" => "seen"); 929 938 $this->set_messages_flag($params); 939 930 940 $content = $this->process_embedded_images($msg,$msg_number,$content, $msg_folder); 931 941 $content = $this->replace_special_characters($content); 932 942 $return['body'] = $content; 943 933 944 return $return; 934 945 }
Note: See TracChangeset
for help on using the changeset viewer.