From 36862c4aaf8f2ff5715c1f1ee54760d35b80b702 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 17 May 2009 16:00:30 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20ajout=20option=20"accus=E9=20r=E9ception?=
 =?UTF-8?q?"=20=E0=20la=20classe=20simplemail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/includes/simplemail/class.mail.php | 10 ++++++++++
 htdocs/lib/CMailFile.class.php            |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/includes/simplemail/class.mail.php b/htdocs/includes/simplemail/class.mail.php
index bb097d5bd04..320b765fb55 100644
--- a/htdocs/includes/simplemail/class.mail.php
+++ b/htdocs/includes/simplemail/class.mail.php
@@ -7,6 +7,7 @@ class simplemail {
 	var $hfrom;
 	var $hbcc;
 	var $hcc;
+	var $deliveryreceipt;
 	
 	var $Xsender;
 	var $ErrorsTo;
@@ -109,6 +110,13 @@ class simplemail {
 		$this->returnpath = $tmp;
 		return TRUE;
 	}
+	
+	function adddeliveryreceipt($deliveryreceipt) {
+		$tmp=$this->makenameplusaddress($deliveryreceipt,'');
+		if ( !$tmp ) { $this->error_log(" Disposition-Notification-To: error"); return FALSE; }
+		$this->deliveryreceipt = $tmp;
+		return TRUE;
+	}
 
 	
 	// les attachements
@@ -280,6 +288,8 @@ class simplemail {
 		
 		if ( !empty($this->replyto) ) $this->AddField2Header("Reply-To",$this->replyto);
 		
+		if ( !empty($this->deliveryreceipt) ) $this->AddField2Header("Disposition-Notification-To",$this->deliveryreceipt);
+		
 		$this->headers .="MIME-Version: 1.0\r\n";
 		
 		if ( !$this->html && $this->text && !empty($this->attachement) ) {		
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index e07563c3ca3..50058cfb551 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -238,6 +238,12 @@ class CMailFile
 			$this->splitAddress($from);
 			$mail->addfrom($this->sEmail,$this->sName);
 			
+			// Ajout accuse reception
+			if ($deliveryreceipt)
+			{
+				$mail->adddeliveryreceipt($this->sEmail,$this->sName);
+			}
+			
 			// Ajout du destinataire
 			$arrayTo=split(',',$to);
 			foreach($arrayTo as $val)
@@ -267,7 +273,7 @@ class CMailFile
 					$mail->addbcc($this->sEmail,$this->sName);
 				}
 			}
-			
+				
 			//ajout du sujet
 			$mail->addsubject($this->encodetorfc2822($subject));