From 3c748ac6b3d99cf42d3f23449756f47b392eb021 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 19 Dec 2013 17:21:02 +0000 Subject: [PATCH] 2013-12-19 Sergio Martin * include/functions_visual_map.php: Fixed string simple values in visual console for incident #463 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9245 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/include/functions_visual_map.php | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 82ef5e539b..33a6079b34 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2013-12-19 Sergio Martin + + * include/functions_visual_map.php: Fixed string simple + values in visual console for incident #463 + 2013-12-19 Sergio Martin * godmode/modules/manage_network_components_form.php: Fixed WMI diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index ffc2cf6c64..8657a1a38c 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -944,7 +944,6 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line $lines = array (); foreach ($layout_datas as $layout_data) { - //Check the items are from disabled or pending delete modules if ($layout_data['id_agente_modulo'] != 0 && (($layout_data['type'] != LABEL) @@ -1390,8 +1389,6 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line //TODO: change interface to add a period parameter, now is set to 1 day switch ($layout_data['type']) { case SIMPLE_VALUE: - - //Metaconsole db connection if ($layout_data['id_metaconsole'] != 0) { $connection = db_get_row_filter ('tmetaconsole_setup', @@ -1410,8 +1407,11 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line metaconsole_restore_db(); } + // If the value is a string, dont format it + if (!is_string($value)) { + $value = format_for_graph($value, 2); + } - $value = format_for_graph($value, 2); if (!empty($unit_text)) $value .= " " . $unit_text; break;