tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Error fixes

Browse Source
This commit is contained in:
Alejandro Gallardo Escobar 2015-01-26 19:31:53 +01:00
parent 4c016548c6
commit 43840408d6
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/class/Tree.class.php
View File

@ -1683,8 +1683,8 @@ class Tree {
unset($items[$key]); unset($items[$key]);
// The 'id' parameter will be stored as 'server_id' => 'id' // The 'id' parameter will be stored as 'server_id' => 'id'
// $resultItem['id'] = array(); $resultItem['id'] = array();
// $resultItem['id'][$child['server_id']] = $child['id']; $resultItem['id'][$child['server_id']] = $child['id'];
$resultItem['rootID'] = array(); $resultItem['rootID'] = array();
$resultItem['rootID'][$child['server_id']] = $child['rootID']; $resultItem['rootID'][$child['server_id']] = $child['rootID'];
@ -1719,7 +1719,7 @@ class Tree {
// Match with the name // Match with the name
if ($child['name'] == $child2['name'] && $child['type'] == $child2['type']) { if ($child['name'] == $child2['name'] && $child['type'] == $child2['type']) {
// Add the matched ids // Add the matched ids
// $resultItem['id'][$child2['server_id']] = $child2['id']; $resultItem['id'][$child2['server_id']] = $child2['id'];
$resultItem['rootID'][$child2['server_id']] = $child2['rootID']; $resultItem['rootID'][$child2['server_id']] = $child2['rootID'];
// Add the matched counters // Add the matched counters
@ -1732,7 +1732,7 @@ class Tree {
// Add the matched children // Add the matched children
if (isset($child2['children'])) if (isset($child2['children']))
$resultItem['children'] += $child2['children']; $resultItem['children'] = array_merge($resultItem['children'], $child2['children']);
// Sum the agents number // Sum the agents number
if (isset($child2['agentsNum'])) if (isset($child2['agentsNum']))
@ -1751,7 +1751,7 @@ class Tree {
$mergedItems[] = $resultItem; $mergedItems[] = $resultItem;
} }
//usort($mergedItems, "cmpSortNames"); usort($mergedItems, "cmpSortNames");
return $mergedItems; return $mergedItems;
} }
@ -1789,7 +1789,8 @@ class Tree {
if (empty($item['parent'])) if (empty($item['parent']))
$processed_items[] = __getProcessedItem($key, $items, $server['id']); $processed_items[] = __getProcessedItem($key, $items, $server['id']);
} }
$item_list += $processed_items; //$item_list += $processed_items;
$item_list = array_merge($item_list, $processed_items);
metaconsole_restore_db(); metaconsole_restore_db();
} }
@ -1819,7 +1820,8 @@ class Tree {
$this->rootID = $rootID; $this->rootID = $rootID;
$newItems = $this->getItems(); $newItems = $this->getItems();
$this->processAgents($newItems); $this->processAgents($newItems);
$items += $newItems; //$items += $newItems;
$items = array_merge($items, $newItems);
metaconsole_restore_db(); metaconsole_restore_db();
} }