Changeset 1638 for trunk/expressoMail1_2/inc/class.phpmailer.php
- Timestamp:
- 11/13/09 13:24:21 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.phpmailer.php
r1247 r1638 1020 1020 } 1021 1021 1022 $from = array(); 1023 $from[0][0] = trim($this->From); 1024 $from[0][1] = $this->FromName; 1025 $result .= $this->AddrAppend("From", $from); 1026 /* 1022 1027 if (!$this->SaveMessageAsDraft){ 1023 1028 $from = array(); … … 1032 1037 $result .= $this->AddrAppend("Sender", $sender); 1033 1038 } 1034 1039 */ 1035 1040 // sendmail and mail() extract Bcc from the header before sending 1036 1041 if((($this->Mailer == "sendmail") || ($this->Mailer == "mail")) && (count($this->bcc) > 0)) 1037 1042 $result .= $this->AddrAppend("Bcc", $this->bcc); 1038 1043 if ($this->SaveMessageAsDraft){ 1044 $result .= $this->AddrAppend("Bcc", $this->bcc); 1045 } 1039 1046 if(count($this->ReplyTo) > 0) 1040 1047 $result .= $this->AddrAppend("Reply-to", $this->ReplyTo); … … 1077 1084 switch($this->message_type) 1078 1085 { 1079 case "plain": 1086 case "plain":$folder = mb_convert_encoding($folder, "UTF7-IMAP","ISO_8859-1"); 1080 1087 $result .= $this->HeaderLine("Content-Transfer-Encoding", $this->Encoding); 1081 1088 $result .= sprintf("Content-Type: %s; charset=\"%s\"",
Note: See TracChangeset
for help on using the changeset viewer.