From bf2485ec25679826353b34e3c4c72fd9bf3f947a Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 26 Apr 2017 12:00:08 +0200
Subject: [PATCH] fixed errors send email text-plain

---
 pandora_console/godmode/alerts/alert_commands.php |  2 +-
 pandora_server/lib/PandoraFMS/Core.pm             | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index ae6423cd71..d4106e3460 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -146,7 +146,7 @@ if (is_ajax ()) {
 				if (preg_match ("/^_html_editor_$/i", $field_value)) {
 					
 					$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 .= "&nbsp;&nbsp;&nbsp;&nbsp;";
 					$editor_type_chkbx .= __('Advanced') . "&nbsp;&nbsp;";
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 5946e66d3a..241243cdc1 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1095,7 +1095,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		my $url ||= $pa_config->{"console_api_url"};
 		
 		my $params = {};
-		$params->{"apipass"} ||= $pa_config->{"console_api_pass"};
+		$params->{"apipass"} = $pa_config->{"console_api_pass"};
 		$params->{"user"} ||= $pa_config->{"console_user"};
 		$params->{"pass"} ||= $pa_config->{"console_pass"};
 		$params->{"op"} = "get";
@@ -1135,10 +1135,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/html; charset="UTF-8"';
+		}
 		
 		# Build the mail with attached content
 		if (keys(%{$module_graph_list}) > 0) {