From 54c6cbe29bd5564cbfcba07bd1bc75edd3a85860 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 2 Feb 2012 09:48:35 +0100 Subject: [PATCH] Fix: return-path not required as it's same than form --- htdocs/core/class/CMailFile.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 9b225b5933b..fdf52d67ba6 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -107,13 +107,13 @@ class CMailFile $this->eol="\r\n"; // On defini mixed_boundary - $this->mixed_boundary = dol_hash(uniqid("dolibarr1")); + $this->mixed_boundary = 'mul_'.dol_hash(uniqid("dolibarr1")); // On defini related_boundary - $this->related_boundary = dol_hash(uniqid("dolibarr2")); + $this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2")); // On defini alternative_boundary - $this->alternative_boundary = dol_hash(uniqid("dolibarr3")); + $this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3")); // If ending method not defined if (empty($conf->global->MAIN_MAIL_SENDMODE)) $conf->global->MAIN_MAIL_SENDMODE='mail'; @@ -588,9 +588,9 @@ class CMailFile $host = dol_getprefix(); // Sender - //$out .= "X-Sender: ".getValidAddress($this->addr_from,2).$this->eol; + //$out .= "Sender: ".getValidAddress($this->addr_from,2).$this->eol; $out .= "From: ".$this->getValidAddress($this->addr_from,0,1).$this->eol; - $out .= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol; + //$out .= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol; if (isset($this->reply_to) && $this->reply_to) $out .= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol; if (isset($this->errors_to) && $this->errors_to) $out .= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol;