From af18b475f892b1b1c7aeb2ae9188ef1ca2b3182d Mon Sep 17 00:00:00 2001
From: ramonn <noreply@pandorafms.org>
Date: Thu, 23 Dec 2010 12:05:18 +0000
Subject: [PATCH] 2010-12-23  Ramon Novoa  <rnovoa@artica.es>

	* include/javascript/pandora.js: Translate space HTML entities.
	  Fixes bug #3142670.

	* godmode/alerts/configure_alert_action.php: Added a link to the
	  macro help page.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3695 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                                 | 8 ++++++++
 pandora_console/godmode/alerts/configure_alert_action.php | 2 +-
 pandora_console/include/javascript/pandora.js             | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 77676ee9fc..9996978520 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-23  Ramon Novoa  <rnovoa@artica.es>
+
+	* include/javascript/pandora.js: Translate space HTML entities.
+	  Fixes bug #3142670.
+
+	* godmode/alerts/configure_alert_action.php: Added a link to the
+	  macro help page.
+
 2010-12-23  Sergio Martin <sergio.martin@artica.es>
 
 	* operation/events/events_validate.php: Fixed the style of
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index b19d5ecd7b..246f064670 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -72,7 +72,7 @@ $table->data[2][1] .= __('Create Command');
 $table->data[2][1] .= '</a>';
 
 $table->data[3][0] = __('Field 1');
-$table->data[3][1] = print_input_text ('field1', $field1, '', 35, 255, true);
+$table->data[3][1] = print_input_text ('field1', $field1, '', 35, 255, true) . print_help_icon ('alert_macros', true);
 
 $table->data[4][0] = __('Field 2');
 $table->data[4][1] = print_input_text ('field2', $field2, '', 80, 255, true);
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 0899aed6ac..7712812ac5 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -33,7 +33,7 @@ function js_html_entity_decode (str) {
 	str2 = str.replace (/</g, "&lt;").
 	replace (/>/g,"&gt;").replace(/&lt;/g,'<').replace(/&gt;/g,'>')
 	.replace(/&#92;/g,'\\').replace(/&quot;/g,'\"').replace(/&#039;/g,'\'')
-	.replace(/&amp;/g,'&')
+	.replace(/&amp;/g,'&').replace(/&#x20;/g,' ')
 	.replace(/&#13;/g, '\r').replace(/&#10;/g, '\n');
 	
 	return str2;