From 361ed9b69dd6efb9fcc4648a31d6da801748a908 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 5 Sep 2013 12:34:03 +0000 Subject: [PATCH] 2013-09-05 Miguel de Dios * godmode/agentes/module_manager_editor_plugin.php, include/javascript/pandora_modules.js: fixed the double apply entities in the plugin components. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8745 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ .../godmode/agentes/module_manager_editor_plugin.php | 8 ++++---- pandora_console/include/javascript/pandora_modules.js | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 40a2dfad03..12c344ecf3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2013-09-05 Miguel de Dios + + * godmode/agentes/module_manager_editor_plugin.php, + include/javascript/pandora_modules.js: fixed the double apply + entities in the plugin components. + 2013-09-05 Miguel de Dios * include/functions_filemanager.php: fixed PHP notice when this diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php index 0a34a260ac..b9957b2e34 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php +++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php @@ -75,13 +75,13 @@ $table_simple->rowstyle['macro_field'] = 'display:none'; push_table_simple ($data, 'macro_field'); // If there are $macros, we create the form fields -if(!empty($macros)) { +if (!empty($macros)) { $macros = json_decode($macros, true); - - foreach($macros as $k => $m) { + + foreach ($macros as $k => $m) { $data = array (); $data[0] = $m['desc']; - if(!empty($m['help'])) { + if (!empty($m['help'])) { $data[0] .= ui_print_help_tip ($m['help'], true); } $data[1] = html_print_input_text($m['macro'], $m['value'], '', 100, 255, true); diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js index 30904f9449..24cc5da975 100644 --- a/pandora_console/include/javascript/pandora_modules.js +++ b/pandora_console/include/javascript/pandora_modules.js @@ -547,7 +547,7 @@ function add_macro_field(macro, row_model_id) { // Change the carriage returns by html returns
in help var macro_help = macro['help'].replace(/ /g,"
"); var macro_macro = macro['macro']; - var macro_value = macro['value']; + var macro_value = $('
').html(macro['value']).text();; var row_id = row_model_id + macro_macro;