From 499c94b1d9fde374781f83beda895c209dbe35fa Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Wed, 5 Jan 2005 11:07:12 +0000
Subject: [PATCH] Modification de l'errors-to

---
 htdocs/lib/dolibarrmail.class.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/lib/dolibarrmail.class.php b/htdocs/lib/dolibarrmail.class.php
index 00f4ea4957b..7787a4344fe 100644
--- a/htdocs/lib/dolibarrmail.class.php
+++ b/htdocs/lib/dolibarrmail.class.php
@@ -84,7 +84,6 @@ class DolibarrMail
 
       $this->filename_list = array();
 
-      dolibarr_syslog("DolibarrMail::DolibarrMail");
       dolibarr_syslog("DolibarrMail::DolibarrMail to : ".$this->addr_to);
       dolibarr_syslog("DolibarrMail::DolibarrMail from : ".$this->from);
     }
@@ -100,8 +99,6 @@ class DolibarrMail
   {
     $this->filename_list = $filename_list;
 
-    dolibarr_syslog("DolibarrMail::PrepareFile");
-
     $this->mime_headers="";
 
     if (count($filename_list))
@@ -178,7 +175,6 @@ class DolibarrMail
   
   function sendfile()
   {
-    dolibarr_syslog("DolibarrMail::sendfile");
 
     $this->smtp_headers = $this->write_smtpheaders();
 
@@ -187,7 +183,15 @@ class DolibarrMail
     $headers = $this->smtp_headers . $this->mime_headers;
     $message_comp = $this->text_body . $this->text_encoded;
 
-    $res = mail($this->addr_to,$this->subject,stripslashes($message_comp),$headers);
+    if ($this->errors_to)
+      {
+	dolibarr_syslog("DolibarrMail::sendfile errorsto ".$this->errors_to);
+	$res = mail($this->addr_to,$this->subject,stripslashes($message_comp),$headers,"-f".$this->errors_to);
+      }
+    else
+      {
+	$res = mail($this->addr_to,$this->subject,stripslashes($message_comp),$headers);
+      }
 
     return $res; 
   }
@@ -197,8 +201,6 @@ class DolibarrMail
    */
   function write_to_file()
   {
-    dolibarr_syslog("DolibarrMail::write_to_file");
-
     $this->smtp_headers = $this->write_smtpheaders();
 
     $this->text_body = $this->write_body();
@@ -279,8 +281,8 @@ class DolibarrMail
     if($this->reply_to != "")
       $out = $out . "Reply-To: ".$this->reply_to."\n";
     
-    if($this->errors_to != "")
-      $out = $out . "Errors-to: ".$this->errors_to."\n";
+    //    if($this->errors_to != "")
+    //$out = $out . "Errors-to: ".$this->errors_to."\n";
 
     $out = $out . "X-Mailer: Dolibarr version " . DOL_VERSION ."\n";
     $out = $out . "X-Sender: $this->from\n";