tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '143-no-saca-correos-con-caracteres-no-ascii' into 'develop'

Browse Source 
fixed errors send email text-plain

See merge request !411
This commit is contained in:
vgilc 2017-04-26 16:30:44 +02:00
commit e11acefe38
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/alerts/alert_commands.php
View File

@ -146,7 +146,7 @@ if (is_ajax ()) {
if (preg_match ("/^_html_editor_$/i", $field_value)) { if (preg_match ("/^_html_editor_$/i", $field_value)) {
$editor_type_chkbx = "<div style=\"padding: 4px 0px;\"><b><small>"; $editor_type_chkbx = "<div style=\"padding: 4px 0px;\"><b><small>";
$editor_type_chkbx .= __('Basic') . "&nbsp;&nbsp;"; $editor_type_chkbx .= __('Basic') . ui_print_help_tip (__("For sending emails, text must be HTML format, if you want to use plain text, type it between the following labels: <pre></pre>"), true);
$editor_type_chkbx .= html_print_radio_button_extended ('editor_type_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."_value')", '', true); $editor_type_chkbx .= html_print_radio_button_extended ('editor_type_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."_value')", '', true);
$editor_type_chkbx .= "&nbsp;&nbsp;&nbsp;&nbsp;"; $editor_type_chkbx .= "&nbsp;&nbsp;&nbsp;&nbsp;";
$editor_type_chkbx .= __('Advanced') . "&nbsp;&nbsp;"; $editor_type_chkbx .= __('Advanced') . "&nbsp;&nbsp;";

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

@ -1095,7 +1095,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
my $url ||= $pa_config->{"console_api_url"}; my $url ||= $pa_config->{"console_api_url"};
my $params = {}; my $params = {};
$params->{"apipass"} ||= $pa_config->{"console_api_pass"}; $params->{"apipass"} = $pa_config->{"console_api_pass"};
$params->{"user"} ||= $pa_config->{"console_user"}; $params->{"user"} ||= $pa_config->{"console_user"};
$params->{"pass"} ||= $pa_config->{"console_pass"}; $params->{"pass"} ||= $pa_config->{"console_pass"};
$params->{"op"} = "get"; $params->{"op"} = "get";
@ -1135,10 +1135,10 @@ sub pandora_execute_action ($$$$$$$$$;$) {
# Check if message has non-ascii chars. # Check if message has non-ascii chars.
# non-ascii chars should be encoded in UTF-8. # non-ascii chars should be encoded in UTF-8.
#if ($field3 =~ /[^[:ascii:]]/o) { if ($field3 =~ /[^[:ascii:]]/o) {
# $field3 = encode("UTF-8", $field3); $field3 = encode("UTF-8", $field3);
# $content_type = 'text/plain; charset="UTF-8"'; $content_type = 'text/html; charset="UTF-8"';
#} }
# Build the mail with attached content # Build the mail with attached content
if (keys(%{$module_graph_list}) > 0) { if (keys(%{$module_graph_list}) > 0) {