From 3c609b4d6d2393f8bb414faace394bb09c70a1d0 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 19 Sep 2019 13:17:29 +0200 Subject: [PATCH 1/3] Changed the mode of obtain the title --- pandora_console/operation/agentes/stat_win.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 18f2fea040..25733d6531 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -49,11 +49,11 @@ if (file_exists('../../include/languages/'.$user_language.'.mo')) { echo ''; -$label = get_parameter('label'); -$label = base64_decode($label); -$id = get_parameter('id'); -$id_agent = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $id); -$alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); +$id = get_parameter('id'); +$id_agent = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $id); +$alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); +$label = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $id); +$label_graph = $label; // $agent = agents_get_agent_with_ip ("192.168.50.31"); // $label = rawurldecode(urldecode(base64_decode(get_parameter('label', '')))); ?> @@ -118,7 +118,6 @@ $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); $period = get_parameter('period'); $id = get_parameter('id', 0); $label = get_parameter('label', ''); - $label_graph = base64_decode(get_parameter('label', '')); $start_date = get_parameter('start_date', date('Y/m/d')); $start_time = get_parameter('start_time', date('H:i:s')); $draw_events = get_parameter('draw_events', 0); From d7ca703c99a3e928a88e228c809f2d43ac08e842 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Fri, 20 Sep 2019 10:53:09 +0200 Subject: [PATCH 2/3] Cleaned the javascript call --- pandora_console/extensions/agents_modules.php | 6 +----- pandora_console/include/ajax/module.php | 6 +----- pandora_console/include/class/Tree.class.php | 1 - pandora_console/include/functions_events.php | 1 - pandora_console/operation/agentes/stat_win.php | 4 +--- pandora_console/operation/agentes/status_monitor.php | 1 - 6 files changed, 3 insertions(+), 16 deletions(-) diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 97657f5189..30176f5625 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -538,11 +538,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='.SECONDS_1DAY.'&'.'id='.$module_id.'&'.'label='.rawurlencode( - urlencode( - base64_encode($module['name']) - ) - ).'&'.'refresh='.SECONDS_10MINUTES."', 'day_".$win_handle."')"; + $link = "winopeng('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module_id.'&'.'refresh='.SECONDS_10MINUTES."', 'day_".$win_handle."')"; echo ''; switch ($status) { diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index e34d287da5..b91dc464f4 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1141,11 +1141,7 @@ if (check_login()) { $draw_events = 0; } - $link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&id='.$module['id_agente_modulo'].'&label='.rawurlencode( - urlencode( - base64_encode($module['nombre']) - ) - ).'&refresh='.SECONDS_10MINUTES.'&'."draw_events=$draw_events', 'day_".$win_handle."', 1000, 700)"; + $link = "winopeng_var('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&id='.$module['id_agente_modulo'].'&refresh='.SECONDS_10MINUTES.'&'."draw_events=$draw_events', 'day_".$win_handle."', 1000, 700)"; if (!is_snapshot_data($module['datos'])) { $data[8] .= ''.html_print_image('images/chart_curve.png', true, ['border' => '0', 'alt' => '']).'   '; } diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php index f5af14a6db..d448a2b1ed 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -652,7 +652,6 @@ class Tree 'type' => $graphType, 'period' => SECONDS_1DAY, 'id' => $module['id'], - 'label' => base64_encode($module['name']), 'refresh' => SECONDS_10MINUTES, ]; diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index ffb36aa3ae..bf2dfba758 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -4083,7 +4083,6 @@ function events_page_details($event, $server='') 'type' => $graph_type, 'period' => SECONDS_1DAY, 'id' => $module['id_agente_modulo'], - 'label' => base64_encode($module['nombre']), 'refresh' => SECONDS_10MINUTES, ]; diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 25733d6531..05fd4c7c4b 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -53,7 +53,6 @@ $id = get_parameter('id'); $id_agent = db_get_value('id_agente', 'tagente_modulo', 'id_agente_modulo', $id); $alias = db_get_value('alias', 'tagente', 'id_agente', $id_agent); $label = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $id); -$label_graph = $label; // $agent = agents_get_agent_with_ip ("192.168.50.31"); // $label = rawurldecode(urldecode(base64_decode(get_parameter('label', '')))); ?> @@ -117,7 +116,6 @@ $label_graph = $label; $period = get_parameter('period'); $id = get_parameter('id', 0); - $label = get_parameter('label', ''); $start_date = get_parameter('start_date', date('Y/m/d')); $start_time = get_parameter('start_time', date('H:i:s')); $draw_events = get_parameter('draw_events', 0); @@ -189,7 +187,7 @@ $label_graph = $label; 'agent_module_id' => $id, 'period' => $period, 'show_events' => $draw_events, - 'title' => $label_graph, + 'title' => $label, 'unit_name' => $unit, 'show_alerts' => $draw_alerts, 'date' => $date, diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 0f7257663a..94a961c18d 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1501,7 +1501,6 @@ if (!empty($result)) { 'type' => $graph_type, 'period' => SECONDS_1DAY, 'id' => $row['id_agente_modulo'], - 'label' => base64_encode($row['module_name']), 'refresh' => SECONDS_10MINUTES, ]; From aa345b168d447beff0931643f7f67dfffb11de48 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Fri, 20 Sep 2019 11:04:12 +0200 Subject: [PATCH 3/3] Upload of forgot file --- pandora_console/operation/search_modules.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pandora_console/operation/search_modules.php b/pandora_console/operation/search_modules.php index bb86159035..70915b30bd 100644 --- a/pandora_console/operation/search_modules.php +++ b/pandora_console/operation/search_modules.php @@ -152,11 +152,7 @@ if (!$modules || !$searchModules) { $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='.SECONDS_1DAY.'&'.'id='.$module['id_agente_modulo'].'&'.'label='.rawurlencode( - urlencode( - base64_encode($module['module_name']) - ) - ).'&'.'refresh='.SECONDS_10MINUTES."', "."'day_".$win_handle."')"; + $link = "winopeng('".'operation/agentes/stat_win.php?'."type=$graph_type&".'period='.SECONDS_1DAY.'&'.'id='.$module['id_agente_modulo'].'&'.'refresh='.SECONDS_10MINUTES."', "."'day_".$win_handle."')"; $graphCell = ''.html_print_image('images/chart_curve.png', true, ['border' => 0, 'alt' => '']).''; $graphCell .= ' '."".html_print_image(