From 5296398cb53b77e64139dd5941d163f7d483b3d2 Mon Sep 17 00:00:00 2001 From: Regis Houssin <regis@dolibarr.fr> Date: Sat, 22 Jul 2006 13:22:51 +0000 Subject: [PATCH] Modif: le corp du message sera en html si on utilise FCKeditor pour le mailing --- htdocs/admin/fckeditor.php | 2 +- htdocs/lib/CMailFile.class.php | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index 24e397f2eae..8fb68d93b16 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -1,6 +1,6 @@ <?php /* 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 * it under the terms of the GNU General Public License as published by diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 6839221f3ba..f25be75f6ea 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -223,11 +223,19 @@ class CMailFile */ function write_body($msgtext, $filename_list) { + global $conf; $out=''; if (count($filename_list)) { $out = "--" . $this->mime_boundary . "\n"; - $out = $out . "Content-Type: text/plain; charset=\"iso8859-15\"\n\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=\"us-ascii\"\n\n"; } $out = $out . $msgtext . "\n"; -- GitLab