diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 04aaf9843d..3258dc482e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2008-08-28 Esteban Sanchez + + * include/functions_visual_map.php: Fixed an error when there were no + elements in the map that cause Javascript failure and nothing works. + Thanks Jorge for the advice. + 2008-08-27 Raul Mateos * operation/agentes/status_monitor.php: Moved legend. diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index c56db68269..22d214a962 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -24,100 +24,98 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines = $layout_datas = get_db_all_rows_field_filter ('tlayout_data', 'id_layout', $id_layout); $lines = array (); - if ($layout_datas === false) { - echo ''; - return; - } - - foreach ($layout_datas as $layout_data) { - // Linked to other layout ?? - Only if not module defined - if (($layout_data['id_layout_linked'] != 0) && ($layout_data['id_agente_modulo'] == 0)) { - $status = return_status_layout ($layout_data['id_layout_linked']); - } else { - $id_agent = get_db_value ("id_agente", "tagente_estado", "id_agente_modulo", $layout_data['id_agente_modulo']); - $id_agent_module_parent = get_db_value ("id_agente_modulo", "tlayout_data", "id", $layout_data["parent_item"]); - // Item value - $status = return_status_agent_module ($layout_data['id_agente_modulo']); - if ($layout_data['no_link_color'] == 1) - $status_parent = -1; - else - $status_parent = return_status_agent_module ($id_agent_module_parent); - } - - // STATIC IMAGE (type = 0) - if ($layout_data['type'] == 0) { - - // Link image - //index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=1 - if ($status == 0) // Bad monitor - $z_index = 2; - elseif ($status == 2) // Alert - $z_index = 3; - else - $z_index = 1; // Print BAD over good - - // Draw image - echo '
'; - if ($show_links) { - if ($layout_data['id_layout_linked'] == "" || $layout_data['id_layout_linked'] == 0) { - echo ""; - } else { - echo ''; - } - } - if ($status == 0) { - if ($layout_data['width'] != "" && $layout_data['width'] != 0) - echo ''; - else - echo ''; - } else { - if ($layout_data['width'] != "" && $layout_data['width'] != 0) - echo ''; - else - echo ''; - } - echo ""; - - // Draw label - echo "
"; - echo $layout_data['label']; - echo "
"; - } - // SINGLE GRAPH (type = 1) - if ($layout_data['type'] == 1) { // single graph + if ($layout_datas !== false) { - // Draw image - echo '
'; - if ($show_links) { - if (($layout_data['id_layout_linked'] == "") || ($layout_data['id_layout_linked'] == 0)) { - echo ''; - } else { - echo ''; - } + foreach ($layout_datas as $layout_data) { + // Linked to other layout ?? - Only if not module defined + if (($layout_data['id_layout_linked'] != 0) && ($layout_data['id_agente_modulo'] == 0)) { + $status = return_status_layout ($layout_data['id_layout_linked']); + } else { + $id_agent = get_db_value ("id_agente", "tagente_estado", "id_agente_modulo", $layout_data['id_agente_modulo']); + $id_agent_module_parent = get_db_value ("id_agente_modulo", "tlayout_data", "id", $layout_data["parent_item"]); + // Item value + $status = return_status_agent_module ($layout_data['id_agente_modulo']); + if ($layout_data['no_link_color'] == 1) + $status_parent = -1; + else + $status_parent = return_status_agent_module ($id_agent_module_parent); + } + + // STATIC IMAGE (type = 0) + if ($layout_data['type'] == 0) { + + // Link image + //index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=1 + if ($status == 0) // Bad monitor + $z_index = 2; + elseif ($status == 2) // Alert + $z_index = 3; + else + $z_index = 1; // Print BAD over good + + // Draw image + echo '"; + } + // SINGLE GRAPH (type = 1) + if ($layout_data['type'] == 1) { // single graph + + // Draw image + echo '
'; + if ($show_links) { + if (($layout_data['id_layout_linked'] == "") || ($layout_data['id_layout_linked'] == 0)) { + echo ''; + } else { + echo ''; + } + } + echo ''; + echo ""; + echo "
"; + } else if ($layout_data['type'] == 2) { + $line['id'] = $layout_data['id']; + $line['x'] = $layout_data['pos_x']; + $line['y'] = $layout_data['pos_y']; + $line['width'] = $layout_data['width']; + $line['height'] = $layout_data['height']; + $line['color'] = $layout_data['label_color']; + array_push ($lines, $line); } - echo ''; - echo ""; - echo "
"; - } else if ($layout_data['type'] == 2) { - $line['id'] = $layout_data['id']; - $line['x'] = $layout_data['pos_x']; - $line['y'] = $layout_data['pos_y']; - $line['width'] = $layout_data['width']; - $line['height'] = $layout_data['height']; - $line['color'] = $layout_data['label_color']; - array_push ($lines, $line); - } - // Get parent relationship - Create line data - if ($layout_data["parent_item"] != "" && $layout_data["parent_item"] != 0) { - $line['id'] = $layout_data['id']; - $line['node_begin'] = 'layout-data-'.$layout_data["parent_item"]; - $line['node_end'] = 'layout-data-'.$layout_data["id"]; - $line['color'] = $status_parent ? '#00dd00' : '#dd0000'; - array_push ($lines, $line); + // Get parent relationship - Create line data + if ($layout_data["parent_item"] != "" && $layout_data["parent_item"] != 0) { + $line['id'] = $layout_data['id']; + $line['node_begin'] = 'layout-data-'.$layout_data["parent_item"]; + $line['node_end'] = 'layout-data-'.$layout_data["id"]; + $line['color'] = $status_parent ? '#00dd00' : '#dd0000'; + array_push ($lines, $line); + } } } if ($draw_lines) {