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

Modif: le corp du message sera en html si on utilise FCKeditor pour le mailing

Browse Source
This commit is contained in:
Regis Houssin 2006-07-22 13:22:51 +00:00
parent 385fca7903
commit 5296398cb5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/fckeditor.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2005-2006 Regis Houssin <regis.houssin@cap-networks.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

8
htdocs/lib/CMailFile.class.php
View File

@ -223,11 +223,19 @@ class CMailFile
*/ */
function write_body($msgtext, $filename_list) function write_body($msgtext, $filename_list)
{ {
global $conf;
$out=''; $out='';
if (count($filename_list)) if (count($filename_list))
{ {
$out = "--" . $this->mime_boundary . "\n"; $out = "--" . $this->mime_boundary . "\n";
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING)
{
$out = $out . "Content-Type: text/html; charset=\"iso8859-15\"\n\n";
}
else
{
$out = $out . "Content-Type: text/plain; charset=\"iso8859-15\"\n\n"; $out = $out . "Content-Type: text/plain; charset=\"iso8859-15\"\n\n";
}
// $out = $out . "Content-Type: text/plain; charset=\"us-ascii\"\n\n"; // $out = $out . "Content-Type: text/plain; charset=\"us-ascii\"\n\n";
} }
$out = $out . $msgtext . "\n"; $out = $out . $msgtext . "\n";