From 42712adb4193e7286e21242da5af63242ec6c0c8 Mon Sep 17 00:00:00 2001 From: koichirok Date: Mon, 30 Jun 2014 07:54:11 +0000 Subject: [PATCH] 2014-06-30 Koichiro KIKUCHI * extensions/agents_modules.php, include/functions_events.php, operation/agentes/estado_monitores.php, operation/agentes/status_monitor.php, operation/search_modules.php, operation/tree.php: Fixed garbled title issue in the module graph. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/extensions/agents_modules.php | 2 +- pandora_console/include/functions_events.php | 2 +- pandora_console/operation/agentes/estado_monitores.php | 4 ++-- pandora_console/operation/agentes/status_monitor.php | 4 ++-- pandora_console/operation/search_modules.php | 2 +- pandora_console/operation/tree.php | 4 ++-- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 304fc6c5e2..e6faa6bb8c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2014-06-30 Koichiro KIKUCHI + + * extensions/agents_modules.php, + include/functions_events.php, + operation/agentes/estado_monitores.php, + operation/agentes/status_monitor.php, + operation/search_modules.php, + operation/tree.php: Fixed the garbled title issue in the module graph. + 2014-06-27 Miguel de Dios * godmode/update_manager/update_manager.online.php: set to 500mb the diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index a09445faad..81b9ce5f88 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -262,7 +262,7 @@ function mainAgentsModules() { echo ""; $win_handle = dechex(crc32($module_id.$module["name"])); $graph_type = return_graphtype (modules_get_agentmodule_type($module_id)); - $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module_id."&label=".base64_encode($module["name"])."&refresh=600','day_".$win_handle."')"; + $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module_id."&label=".rawurlencode(urlencode(base64_encode($module["name"])))."&refresh=600','day_".$win_handle."')"; echo ''; switch ($status) { diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index eb6c159379..3e1d8ea28e 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -1920,7 +1920,7 @@ function events_page_details ($event, $server = "") { if (isset($module["module_name"])) { $module_module_name = $module["module_name"]; } - $link ="winopeng('" . $serverstring . "operation/agentes/stat_win.php?type=" . $graph_type."&period=86400&id=" . $module["id_agente_modulo"] . "&label=" . base64_encode($module_module_name) . $hashstring . "&refresh=600','day_".$win_handle."')"; + $link ="winopeng('" . $serverstring . "operation/agentes/stat_win.php?type=" . $graph_type."&period=86400&id=" . $module["id_agente_modulo"] . "&label=" . rawurlencode(urlencode(base64_encode($module_module_name))) . $hashstring . "&refresh=600','day_".$win_handle."')"; $data[1] = ''; $data[1] .= html_print_image('images/chart_curve.png',true); diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 7700e4324e..866e43922f 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -572,7 +572,7 @@ foreach ($modules as $module) { $link ="winopeng_var('operation/agentes/snapshot_view.php?" . "id=" . $module["id_agente_modulo"] . "&refr=" . $module["current_interval"] . - "&label=" . $module["nombre"] . "','".$win_handle."', 700,480)"; + "&label=" . rawurlencode($module["nombre"]) . "','".$win_handle."', 700,480)"; $salida = '' . html_print_image("images/default_list.png", true, @@ -633,7 +633,7 @@ foreach ($modules as $module) { $url = 'include/procesos.php?agente='.$module["id_agente_modulo"]; $win_handle=dechex(crc32($module["id_agente_modulo"].$module["nombre"])); - $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".base64_encode($module["nombre"])."&refresh=600','day_".$win_handle."')"; + $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".rawurlencode(urlencode(base64_encode($module["nombre"])))."&refresh=600','day_".$win_handle."')"; $data[8] .= '' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '   '; $server_name = ''; diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 10745773ac..b585d85d29 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1121,9 +1121,9 @@ foreach ($result as $row) { $win_handle=dechex(crc32($row["id_agente_modulo"].$row["module_name"])); if (defined('METACONSOLE')) - $link ="winopeng('" . $row['server_url'] . "operation/agentes/stat_win.php?type=$graph_type&period=86400&loginhash=auto&loginhash_data=" . $row["hashdata"] . "&loginhash_user=" . $row["user"] . "&id=".$row["id_agente_modulo"]."&label=".base64_encode($row["module_name"])."&refresh=600','day_".$win_handle."')"; + $link ="winopeng('" . $row['server_url'] . "operation/agentes/stat_win.php?type=$graph_type&period=86400&loginhash=auto&loginhash_data=" . $row["hashdata"] . "&loginhash_user=" . $row["user"] . "&id=".$row["id_agente_modulo"]."&label=".rawurlencode(urlencode(base64_encode($row["module_name"])))."&refresh=600','day_".$win_handle."')"; else - $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$row["id_agente_modulo"]."&label=".base64_encode($row["module_name"])."&refresh=600','day_".$win_handle."')"; + $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$row["id_agente_modulo"]."&label=".rawurlencode(urlencode(base64_encode($row["module_name"])))."&refresh=600','day_".$win_handle."')"; $data[7] = '' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . ''; if (defined('METACONSOLE')) diff --git a/pandora_console/operation/search_modules.php b/pandora_console/operation/search_modules.php index 472048f24e..2fa48e77c6 100644 --- a/pandora_console/operation/search_modules.php +++ b/pandora_console/operation/search_modules.php @@ -148,7 +148,7 @@ else { $url = 'include/procesos.php?agente=' . $module["id_agente_modulo"]; $win_handle = dechex(crc32($module["id_agente_modulo"] . $module["module_name"])); - $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".base64_encode($module["module_name"])."&refresh=600','day_".$win_handle."')"; + $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".rawurlencode(urlencode(base64_encode($module["module_name"])))."&refresh=600','day_".$win_handle."')"; $graphCell = '' . html_print_image("images/chart_curve.png", true, array("border" => 0, "alt" => "")) . ''; $graphCell .= " " . html_print_image('images/binary.png', true, array("border" => "0", "alt" => "")) . ""; diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index ab030e5c49..47ad28a0a1 100644 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -396,7 +396,7 @@ if (is_ajax ()) "type=$graph_type&" . "period=86400&" . "id=" . $row["id_agente_modulo"] . "&" . - "label=" . base64_encode($row["nombre"]) . "&" . + "label=" . rawurlencode(urlencode(base64_encode($row["nombre"]))) . "&" . "refresh=600"); } else { @@ -405,7 +405,7 @@ if (is_ajax ()) "type=$graph_type&" . "period=86400&" . "id=" . $row["id_agente_modulo"] . "&" . - "label=" . base64_encode($row["nombre"]) . "&" . + "label=" . rawurlencode(urlencode(base64_encode($row["nombre"]))) . "&" . "refresh=600"; } $link ="winopeng('" . $url_module_graph . "','day_".$win_handle."')";