From e401dfa8bdf0212d2de9b14a33c4298736b7fba8 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 25 May 2015 13:02:22 +0200 Subject: [PATCH] Fixed the 'event_report_agent', 'event_report_group' and 'event_report_module' items in metaconsole reports. TICKET: #2249 --- .../include/functions_reporting.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 17887f5252..aa7f855b16 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -1226,6 +1226,14 @@ function reporting_event_report_group($report, $content, $content['name'] = __('Event Report Group'); } + if ($config['metaconsole']) { + $id_meta = metaconsole_get_id_server($content["server_name"]); + + + $server = metaconsole_get_connection_by_id ($id_meta); + metaconsole_connect($server); + } + $return['title'] = $content['name']; $return['subtitle'] = groups_get_name($content['id_group'], true); if (!empty($content['style']['event_filter_search'])) { @@ -1378,6 +1386,10 @@ function reporting_event_report_group($report, $content, $ttl); } + if ($config['metaconsole']) { + metaconsole_restore_db(); + } + return reporting_check_structure_content($return); } @@ -1390,6 +1402,14 @@ function reporting_event_report_module($report, $content) { $content['name'] = __('Event Report Module'); } + if ($config['metaconsole']) { + $id_meta = metaconsole_get_id_server($content["server_name"]); + + + $server = metaconsole_get_connection_by_id ($id_meta); + metaconsole_connect($server); + } + $return['title'] = $content['name']; $return['subtitle'] = agents_get_name($content['id_agent']) . " - " . @@ -1409,6 +1429,10 @@ function reporting_event_report_module($report, $content) { $return['data'] = $data; } + if ($config['metaconsole']) { + metaconsole_restore_db(); + } + return reporting_check_structure_content($return); } @@ -2038,6 +2062,14 @@ function reporting_event_report_agent($report, $content, $content['name'] = __('Event Report Agent'); } + if ($config['metaconsole']) { + $id_meta = metaconsole_get_id_server($content["server_name"]); + + + $server = metaconsole_get_connection_by_id ($id_meta); + metaconsole_connect($server); + } + $return['title'] = $content['name']; $return['subtitle'] = agents_get_name($content['id_agent']); $return["description"] = $content["description"]; @@ -2156,6 +2188,10 @@ function reporting_event_report_agent($report, $content, $ttl); } + if ($config['metaconsole']) { + metaconsole_restore_db(); + } + return reporting_check_structure_content($return); }