Changeset 1489
- Timestamp:
- 10/02/09 16:11:19 (14 years ago)
- Location:
- trunk/expressoMail1_2/inc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r1481 r1489 785 785 $obj = imap_rfc822_parse_headers(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values]); 786 786 $content .= "<hr align='left' width='95%' style='border:1px solid #DCDCDC'>"; 787 $content .= "<br> <table style='margin:2px;border:1px solid black;background:#EAEAEA'>";787 $content .= "<br>".$attachment['type'].' - '.$attachment['part_in_msg']."<table style='margin:2px;border:1px solid black;background:#EAEAEA'>"; 788 788 $content .= "<tr><td><b>".$this->functions->getLang("Subject").":</b></td><td>".$this->decode_string($obj->subject)."</td></tr>"; 789 789 $content .= "<tr><td><b>".$this->functions->getLang("From").":</b></td><td>".$this->decode_string($obj->from[0]->mailbox."@".$obj->from[0]->host)."</td></tr>"; … … 791 791 $content .= "<tr><td><b>".$this->functions->getLang("TO").":</b></td><td>".$this->decode_string($obj->to[0]->mailbox."@".$obj->to[0]->host)."</td></tr>"; 792 792 $content .= !$obj->cc ? "</table><br>" :"<tr><td><b>".$this->functions->getLang("CC").":</b></td><td>".$this->decode_string($obj->cc[0]->mailbox."@".$obj->cc[0]->host)."</td></tr></table><br>"; 793 $ix_part = strtolower($attachment['type']) == "delivery-status" ? 1 : 0; 794 $content .= ($this->decodeBody(imap_fetchbody($this->mbox, $msg_number, ($attachment['part_in_msg']+$ix_part).".1", FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values])); 793 $content .= $this->decodeBody( 794 imap_fetchbody( 795 $this->mbox, 796 $msg_number, 797 ( $attachment['part_in_msg'] + ( 798 ( strtolower( $attachment[ 'type' ] ) == 'delivery-status' ) ? 0 : 1 ) 799 ) . ".1", 800 FT_UID 801 ), 802 $msg->encoding[ $msg_number ][ $values ], 803 $msg->charset[ $msg_number ][ $values ] 804 ); 795 805 break; 796 806 } -
trunk/expressoMail1_2/inc/class.message_components.inc.php
r1059 r1489 107 107 $encoding = (empty($parts[$p]->encoding))? $this->encoding_types[0] : $this->encoding_types[$parts[$p]->encoding]; 108 108 if(!preg_match("/5./",phpversion())) 109 $charset = $parts[$p]->parameters[0]->value; 109 $charset = $parts[$p]->parameters[0]->value; 110 110 else 111 111 $charset = $parts->p->parameters[0]->value; 112 112 $skip_next = ($ftype == 'message/rfc822')? true : false; 113 113 114 if ($ftype == 'multipart/mixed' || $skip_part == true && $ftype == 'multipart/alternative') 115 // Por niltonneto: Mensagens do ThunderBird com format=flowed nao abrem, por isso comentado essa condicao: 116 // || $ftype == 'multipart/related') 114 if ($ftype == 'multipart/mixed' || $skip_part == true && $ftype == 'multipart/alternative' || $ftype == 'multipart/related' ) 117 115 { 118 116 $n--; 119 117 } 120 121 118 else 122 119 {
Note: See TracChangeset
for help on using the changeset viewer.