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

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
This commit is contained in:
Ramon Novoa 2010-12-23 12:05:18 +00:00
parent a9603f776e
commit da2304eb14
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -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

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

@ -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);

2
pandora_console/include/javascript/pandora.js
View File

@ -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;