Skip to content
Snippets Groups Projects
Commit 91d3b525 authored by Regis Houssin's avatar Regis Houssin
Browse files

Modification pour envoyer un mailing au format html

parent a45e4849
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/lib/CMailFile.class.php
+ 18
− 10
View file @ 91d3b525
...@@ -228,18 +228,20 @@ class CMailFile ...@@ -228,18 +228,20 @@ class CMailFile
if (count($filename_list)) if (count($filename_list))
{ {
$out = "--" . $this->mime_boundary . "\n"; $out = "--" . $this->mime_boundary . "\n";
$out .= "Content-Type: text/plain; charset=\"iso8859-15\"\n\n";
// $out = $out . "Content-Type: text/plain; charset=\"us-ascii\"\n\n";
}
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING)
{ {
$out .= "Content-Type: text/html; charset=\"iso8859-15\"\n\n"; $out .= "<html><BODY>\n";
$out .= "Content-Transfer-Encoding: quoted-printable\n\n"; $out .= "<html><head><title></title></head><body>";
$out .= $msgtext;
$out .= "</body></html>";
} }
else else
{ {
$out = $out . "Content-Type: text/plain; charset=\"iso8859-15\"\n\n"; $out .= $msgtext . "\n";
}
// $out = $out . "Content-Type: text/plain; charset=\"us-ascii\"\n\n";
} }
$out = $out . $msgtext . "\n";
return $out; return $out;
} }
...@@ -284,6 +286,12 @@ class CMailFile ...@@ -284,6 +286,12 @@ class CMailFile
// if($this->errors_to != "") // if($this->errors_to != "")
//$out = $out . "Errors-to: ".$this->errors_to."\n"; //$out = $out . "Errors-to: ".$this->errors_to."\n";
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING)
{
$out .= "Content-Type: text/html; charset=\"iso-8859-15\"\n";
$out .= "Content-Transfer-Encoding: 8bit\n";
}
dolibarr_syslog("CMailFile::write_smtpheaders $out"); dolibarr_syslog("CMailFile::write_smtpheaders $out");
return $out; return $out;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment