Changeset 2766
- Timestamp:
- 05/12/10 18:02:50 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php
r2759 r2766 760 760 if($file_type == "message/rfc822") 761 761 $has_multipart = false; 762 762 763 763 if($file_type == "multipart/alternative") 764 764 $has_multipart = false; 765 765 766 766 if(($file_type == "text/plain" 767 767 || $file_type == "text/html") 768 768 && $file_type != 'attachment') 769 { 769 { 770 770 if($file_type == "text/plain" && !$show_only_html && $has_multipart) 771 771 { … … 778 778 else if($file_type == "text/html" && $msg->fsize[$msg_number][$values] < 307200) 779 779 { 780 $content .= $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]); 780 $content .= $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]); 781 781 $show_only_html = true; 782 782 } 783 } 784 else if($file_type == "message/delivery-status"){ 783 784 } 785 else if($file_type == "message/delivery-status" || $file_type == "message/feedback-report"){ 785 786 $content .= "<hr align='left' width='95%' style='border:1px solid #DCDCDC'>"; 786 $content .= nl2br($this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values])); 787 $content .= nl2br($this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values])); 787 788 788 789 } … … 856 857 } 857 858 } 858 } 859 } 859 860 } 860 861 if($file_type == "text/plain" && ($show_only_html && $msg_part == 1) || (!$show_only_html && $msg_part == 3)){
Note: See TracChangeset
for help on using the changeset viewer.