From 292021186893db6f7763408bae34832e0a054685 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 9 May 2009 14:58:49 +0000
Subject: [PATCH] =?UTF-8?q?Add:=20possibilit=E9=20d'uploader=20une=20image?=
 =?UTF-8?q?=20et=20de=20l'envoyer=20dans=20un=20mailing=20Todo:=20encore?=
 =?UTF-8?q?=20en=20mode=20d=E9bugage=20!!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/lib/CMailFile.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index eb491b59702..9a46232ee9b 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -462,7 +462,7 @@ class CMailFile
 
 		if ($this->msgishtml)
 		{
-			if (! $this->atleastonefile) $out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
+			if (! $this->atleastonefile || $this->atleastoneimage) $out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
 			$out.= "Content-Transfer-Encoding: 8bit".$this->eol;
 		}
 		else
@@ -551,7 +551,8 @@ class CMailFile
 		{
 			$out.= $msgtext;
 		}
-		$out.= $this->eol;
+		$out.= $this->eol . "--" . $this->mime_boundary . "--" . $this->eol;
+
 		return $out;
 	}
 
@@ -765,7 +766,8 @@ class CMailFile
 		}
 
 		// Fin de tous les attachements
-		$out = $out . "--" . $this->image_boundary . "--" . $this->eol;
+		$out.=  $this->eol . "--" . $this->image_boundary . "--" . $this->eol;
+		
 		return $out;
 	}