diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 81c946d8e3..45b4f21d70 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2010-01-13 Juan Manuel Ramon + + * godmode/reporting/visual_console_builder.editor.js: Label parameter is now coded + in base 64 format when pgraph.php page is requested. + + * godmode/reporting/visual_console_builder.editor.php: Added a javascript include. + + * include/javascript/encode_decode_base64.js: Added new javascript function for base 64 encoding/decoding. + + Fixes bug #3152661, #3147119 + 2011-01-13 Junichi Satoh * include/help/ja/help_create_agent.php, diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 0b29640e90..b86667473d 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -474,8 +474,8 @@ function getModuleGraph(id_data) { period = data['period']; } }); - - var img = 'include/fgraph.php?tipo=sparse&id=' + id_agente_modulo + '&label=' + label + '&height=' + height + '&pure=1&width=' + width + '&period=' + period; + // Base64.encode function is in /include/javascript/encode_decode_base64.js + var img = 'include/fgraph.php?tipo=sparse&id=' + id_agente_modulo + '&label=' + Base64.encode(label) + '&height=' + height + '&pure=1&width=' + width + '&period=' + period; return img; } diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index 8c4fc6e0de..c6a86a3361 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -265,6 +265,8 @@ require_javascript_file('wz_jsgraphics'); require_javascript_file('pandora_visual_console'); require_jquery_file ('autocomplete'); require_javascript_file('visual_console_builder.editor', 'godmode/reporting/'); +// Javascript file for base 64 encoding of label parameter +require_javascript_file ('encode_decode_base64'); ?>