tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed error in macros send mail

This commit is contained in:
daniel 2017-03-10 13:51:06 +01:00
parent cc16225e31
commit b7bf236f3c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -1134,10 +1134,10 @@ sub pandora_execute_action ($$$$$$$$$;$) {
# Check if message has non-ascii chars.
# non-ascii chars should be encoded in UTF-8.
if ($field3 =~ /[^[:ascii:]]/o) {
$field3 = encode("UTF-8", $field3);
$content_type = 'text/plain; charset="UTF-8"';
}
#if ($field3 =~ /[^[:ascii:]]/o) {
# $field3 = encode("UTF-8", $field3);
# $content_type = 'text/plain; charset="UTF-8"';
#}
# Build the mail with attached content
if (keys(%{$module_graph_list}) > 0) {
@ -1147,8 +1147,8 @@ sub pandora_execute_action ($$$$$$$$$;$) {
$boundary = "--" . $boundary;
$field3 = $boundary . "\n"
. "Content-Type: " . $html_content_type . "\n"
. "Content-Transfer-Encoding: quoted-printable\n\n"
. "Content-Type: " . $html_content_type . "\n\n"
#. "Content-Transfer-Encoding: quoted-printable\n\n"
. $field3 . "\n";