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

Restore mime header and return-path now we know where was bug.

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-10 13:28:53 +01:00
parent 39818633df
commit 891f51127b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/CMailFile.class.php
View File

@ -190,7 +190,7 @@ class CMailFile
$smtp_headers = $this->write_smtpheaders(); $smtp_headers = $this->write_smtpheaders();
// Define mime_headers // Define mime_headers
//$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list); $mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
if (! empty($this->html)) if (! empty($this->html))
{ {
@ -592,9 +592,9 @@ class CMailFile
$host = dol_getprefix(); $host = dol_getprefix();
// Sender // Sender
//$out.= "Sender: ".getValidAddress($this->addr_from,2m)).$this->eol2; //$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2; $out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
//$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2; $out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
if (isset($this->reply_to) && $this->reply_to) $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2; if (isset($this->reply_to) && $this->reply_to) $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2; if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;