lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add message for non compatible mime clients

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-02 23:05:26 +01:00
parent b22dc4170c
commit 37afbefdc6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/CMailFile.class.php
View File

@ -226,7 +226,8 @@ class CMailFile
// comme des injections mail par les serveurs de messagerie. // comme des injections mail par les serveurs de messagerie.
$this->headers = preg_replace("/([\r\n]+)$/i","",$this->headers); $this->headers = preg_replace("/([\r\n]+)$/i","",$this->headers);
$this->message = $text_body . $images_encoded . $files_encoded; $this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
$this->message.= $text_body . $images_encoded . $files_encoded;
$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol; $this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
} }
else if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') else if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
@ -607,7 +608,7 @@ class CMailFile
$out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol; $out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol;
$out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol; $out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol;
$out.= "MIME-Version: 1.0".$this->eol; $out.= "Mime-Version: 1.0".$this->eol;
$out.= "Content-Type: multipart/mixed; boundary=\"".$this->mixed_boundary."\"".$this->eol; $out.= "Content-Type: multipart/mixed; boundary=\"".$this->mixed_boundary."\"".$this->eol;
$out.= "Content-Transfer-Encoding: 8bit".$this->eol; $out.= "Content-Transfer-Encoding: 8bit".$this->eol;