From 27558c273d41c949e4ff94e854f872c493e235a0 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 9 May 2009 15:43:13 +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 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 9a46232ee9b..c46e4b20867 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -146,6 +146,9 @@ class CMailFile // On defini image_boundary $this->image_boundary = md5(uniqid(time())); + + // On defini alternative_boundary + $this->alternative_boundary = md5(uniqid(time())); // On definit fin de ligne $this->eol="\n"; @@ -462,7 +465,8 @@ class CMailFile if ($this->msgishtml) { - if (! $this->atleastonefile || $this->atleastoneimage) $out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol; + $out.= "Content-Type: multipart/alternative; boundary=\"".$this->alternative_boundary."\"".$this->eol; + if (! $this->atleastonefile) $out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol; $out.= "Content-Transfer-Encoding: 8bit".$this->eol; } else @@ -526,13 +530,14 @@ class CMailFile if ($this->atleastonefile || $this->atleastoneimage) { - $out.= "--" . $this->mime_boundary . $this->eol; if ($this->msgishtml) { + $out.= "--" . $this->alternative_boundary . $this->eol; $out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol; } else { + $out.= "--" . $this->mime_boundary . $this->eol; $out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol; } $out.= $this->eol; @@ -551,8 +556,6 @@ class CMailFile { $out.= $msgtext; } - $out.= $this->eol . "--" . $this->mime_boundary . "--" . $this->eol; - return $out; } @@ -595,7 +598,7 @@ class CMailFile } // Fin de tous les attachements - $out = $out . "--" . $this->mime_boundary . "--" . $this->eol; + $out.= "--" . $this->mime_boundary . "--" . $this->eol; return $out; } @@ -751,7 +754,7 @@ class CMailFile { dol_syslog("CMailFile::write_images: i=$i"); - $out = $out . "--" . $this->image_boundary . $this->eol; + $out.= "--" . $this->image_boundary . $this->eol; $out.= "Content-Type: " . $img["content_type"] . "; name=\"".$img["name"]."\"".$this->eol; $out.= "Content-Transfer-Encoding: base64".$this->eol; $out.= "Content-ID: <".$img["cid"].">".$this->eol; @@ -766,7 +769,7 @@ class CMailFile } // Fin de tous les attachements - $out.= $this->eol . "--" . $this->image_boundary . "--" . $this->eol; + $out.= "--" . $this->image_boundary . "--" . $this->eol; return $out; }