lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modification traces

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-11 19:14:40 +00:00
parent 339811df37
commit 5d940d2811
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/lib/CMailFile.class.php
View File

@ -71,7 +71,7 @@ class CMailFile
*/ */
function CMailFile($subject,$to,$from,$msg,$filename_list,$mimetype_list,$mimefilename_list,$addr_cc="",$addr_bcc="") function CMailFile($subject,$to,$from,$msg,$filename_list,$mimetype_list,$mimefilename_list,$addr_cc="",$addr_bcc="")
{ {
dolibarr_syslog("CMailFile::CMailfile: filename_list[0]=$filename_list[0], mimetype_list[0]=$mimetype_list[0] mimefilename_list[0]=$mimefilename_list[0]"); dolibarr_syslog("CMailFile::CMailfile: from=$from, filename_list[0]=$filename_list[0], mimetype_list[0]=$mimetype_list[0] mimefilename_list[0]=$mimefilename_list[0]");
$this->mime_boundary = md5( uniqid("dolibarr") ); $this->mime_boundary = md5( uniqid("dolibarr") );
@ -237,17 +237,21 @@ class CMailFile
*/ */
function write_smtpheaders() function write_smtpheaders()
{ {
$out = "From: ".$this->addr_from."\n"; $out = "";
if ($this->addr_cc) $out = $out . "Cc: ".$this->addr_cc."\n";
if ($this->addr_bcc) $out = $out . "Bcc: ".$this->addr_bcc."\n";
if ($this->reply_to) $out = $out . "Reply-To: ".$this->reply_to."\n";
$out .= "X-Mailer: Dolibarr version " . DOL_VERSION ."\n";
$out .= "X-Sender: <$this->addr_from>\n";
$out .= "Return-path: <$this->addr_from>\n";
$out .= "From: $this->addr_from <".$this->addr_from.">\n";
if ($this->addr_cc) $out .= "Cc: ".$this->addr_cc."\n";
if ($this->addr_bcc) $out .= "Bcc: ".$this->addr_bcc."\n";
if ($this->reply_to) $out .= "Reply-To: ".$this->reply_to."\n";
// if($this->errors_to != "") // if($this->errors_to != "")
//$out = $out . "Errors-to: ".$this->errors_to."\n"; //$out = $out . "Errors-to: ".$this->errors_to."\n";
$out = $out . "X-Mailer: Dolibarr version " . DOL_VERSION ."\n"; //dolibarr_syslog("CMailFile::write_smtpheaders $out");
$out = $out . "X-Sender: $this->addr_from\n";
$out = $out . "Return-path: $this->addr_from\n";
return $out; return $out;
} }