From 30774c54d80673a246e2f9c87ea9a2c844ea5b95 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 19 Jan 2015 18:03:35 +0100 Subject: [PATCH] Error fixes --- pandora_console/include/class/Tree.class.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php index 9247a5eeac..13fe6720a6 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -742,8 +742,6 @@ class Tree { foreach ($items as $key => $child) { - $childrenAux = array(); - // Store the item in a temporary element $resultItem = $child; // Remove the item @@ -751,7 +749,7 @@ class Tree { // The 'id' parameter will be stored as 'server_id' => 'id' $resultItem['id'] = array(); - $resultItem['id'][$child['server_id']] = $child['id']; + $resultItem['id'][$resultItem['server_id']] = $resultItem['id']; // Initialize counters if any of it don't exist if (!isset($resultItem['counters'])) @@ -771,6 +769,10 @@ class Tree { if (!isset($resultItem['counters']['alerts'])) $resultItem['counters']['alerts'] = 0; + // Add the children + if (!isset($resultItem['children'])) + $resultItem['children'] = array(); + // Iterate over the list to search items that match the actual item foreach ($items as $key2 => $child2) { // Skip the actual or empty items @@ -792,14 +794,14 @@ class Tree { // Add the matched children if (isset($child2['children'])) - $childrenAux += $child2['children']; + $resultItem['children'] += $child2['children']; // Remove the item unset($items[$key2]); } } // Get the merged children (recursion) - if (!empty($childrenAux)) + if (!empty($resultItem['children'])) $resultItem['children'] = __getMergedItems($childrenAux); // Add the resulting item