From f4d073dc3d93ea0246b32aedd6f9e8b01f0396c7 Mon Sep 17 00:00:00 2001 From: esanchezm Date: Wed, 27 May 2009 08:19:31 +0000 Subject: [PATCH] 2009-05-27 Esteban Sanchez * include/functions_visual_map.php: Problem fixed on get_layout_status() with label elements. Fixed definitely #2787197. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1709 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/include/functions_visual_map.php | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d0a30301ad..f691554f1b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2009-05-27 Esteban Sanchez + + * include/functions_visual_map.php: Problem fixed on + get_layout_status() with label elements. Fixed definitely + #2787197. + 2009-05-27 Esteban Sanchez * include/functions_db.php: return_status_agent() renamed to diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 2c5654b154..2cbe26ae90 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -290,6 +290,8 @@ function get_user_layouts ($id_user = 0, $only_names = false, $filter = false) { function get_layout_status ($id_layout = 0) { $temp_status = 0; $temp_total = 0; + + $id_layout = (int) $id_layout; $sql = sprintf ('SELECT id_agente_modulo, parent_item, id_layout_linked, id_agent FROM `tlayout_data` WHERE `id_layout` = %d', $id_layout); @@ -299,6 +301,8 @@ function get_layout_status ($id_layout = 0) { return 0; foreach ($result as $rownum => $data) { + if ($data["id_layout_linked"] == 0 && $data["id_agente_modulo"] == 0 && $data["id_agent"] == 0) + continue; // Other Layout (Recursive!) if (($data["id_layout_linked"] != 0) && ($data["id_agente_modulo"] == 0)) { $status = get_layout_status ($data["id_layout_linked"]); @@ -309,9 +313,8 @@ function get_layout_status ($id_layout = 0) { } else { $status = get_agent_status ($data["id_agent"]); } - - if ($status == 0) - return 0; + if ($status == 1) + return 1; if ($status > $temp_total) $temp_total = $status; }