From 4608084d214ea75cde6e5fffd7a479ff57fbfb88 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Fri, 8 Jun 2012 11:46:28 +0000 Subject: [PATCH] 2012-06-08 Juan Manuel Ramon * godmode/reporting/reporting_builder.php: Fixed update of custom graph items. o git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6453 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ .../godmode/reporting/reporting_builder.php | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 61ce05d265..c5dfe09b30 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-06-08 Juan Manuel Ramon + + * godmode/reporting/reporting_builder.php: Fixed update of custom + graph items. + 2012-06-08 Junichi Satoh * include/functions_config.php, godmode/setup/setup.php: Fixed that diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 2b17078d64..503ad6f655 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -427,6 +427,7 @@ switch ($action) { $values['id_agent'] = get_parameter('id_agent'); $values['id_gs'] = get_parameter('id_custom_graph'); + $values['id_agent_module'] = ''; if (isset($values['type'])) { if (($values['type'] == 'alert_report_agent') or ($values['type'] == 'event_report_agent')) @@ -464,14 +465,17 @@ switch ($action) { break; } - $id_gs = substr ($values['id_gs'], 0, strpos ($values['id_gs'], '|')); - if ($id_gs !== false) { - $server_name = strstr($values ['id_gs'], '|'); - $values ['id_gs'] = $id_gs; - $values['server_name'] = substr ($server_name, 1, strlen($server_name)); + // If metaconsole is activated + if ($config['metaconsole'] == 1) { + $id_gs = substr ($values['id_gs'], 0, strpos ($values['id_gs'], '|')); + if ($id_gs !== false) { + $server_name = strstr($values ['id_gs'], '|'); + $values ['id_gs'] = $id_gs; + $values['server_name'] = substr ($server_name, 1, strlen($server_name)); + } } - if (($values['type'] == 'sql') OR ($values['type'] == 'sql_graph_hbar')OR ($values['type'] == 'sql_graph_vbar') OR ($values['type'] == 'sql_graph_pie')) { + if (($values['type'] == 'sql') OR ($values['type'] == 'sql_graph_hbar') OR ($values['type'] == 'sql_graph_vbar') OR ($values['type'] == 'sql_graph_pie')) { $values['treport_custom_sql_id'] = get_parameter('id_custom'); if ($values['treport_custom_sql_id'] == 0) { $values['external_source'] = get_parameter('sql');