From e3c01374b17dd0f61e801589d3ab7f953e89106d Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 18 Sep 2017 10:18:38 +0200 Subject: [PATCH] Added changes to meta report templates --- .../include/functions_reporting.php | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 877a0e54b7..66b36f98f1 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -149,15 +149,10 @@ function reporting_make_reporting_data($report = null, $id_report, } if (in_array('label', $content['style'])) { - if (defined('METACONSOLE')) { - array_push ($agents_to_macro, $content['id_agent']); - } - else { - array_push ($agents_to_macro, modules_get_agentmodule_agent($graph_item['id_agent_module'])); - } + array_push ($agents_to_macro, modules_get_agentmodule_agent($graph_item['id_agent_module'])); } } - + $agents_to_macro_aux = array(); foreach ($agents_to_macro as $ag) { if (!in_array($ag, $agents_to_macro_aux)) { @@ -5885,17 +5880,11 @@ function reporting_custom_graph($report, $content, $type = 'dinamic', array_push ($weights, $graph_item["weight"]); if (in_array('label',$content['style'])) { - if (defined('METACONSOLE')) { - $item = array('type' => 'custom_graph', - 'id_agent' =>$content['id_agent'], - 'id_agent_module'=>$graph_item['id_agent_module']); - } - else { - $item = array('type' => 'custom_graph', - 'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']), - 'id_agent_module'=>$graph_item['id_agent_module']); - } + $item = array('type' => 'custom_graph', + 'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']), + 'id_agent_module'=>$graph_item['id_agent_module']); + //html_debug($item); $label = reporting_label_macro($item, $content['style']['label']); $labels[$graph_item['id_agent_module']] = $label; }