tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#10851 Fix order by agent foreach

This commit is contained in:
miguel angel rasteu 2023-05-30 11:47:34 +02:00
parent bd453ea1de
commit cf843eba7a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/functions_inventory.php
View File

@ -806,9 +806,12 @@ function inventory_get_datatable(
$agent_data[$row['id_agente']][] = $row; $agent_data[$row['id_agente']][] = $row;
} }
foreach ($agent_data as $id_agent => $data_rows) { foreach ($agent_data as $id_agent => $data_agent) {
$rows_tmp['agent'] = $row['name_agent']; $rows_tmp['agent'] = $data_agent['name_agent'];
foreach ($data_rows as $row) { foreach ($data_agent as $key => $agent_row) {
$data_agent[$key]['timestamp'] = $agent_row['last_update_timestamp'];
$data_agent[$key]['utimestamp'] = $agent_row['last_update'];
if ($utimestamp > 0) { if ($utimestamp > 0) {
$data_row = db_get_row_sql( $data_row = db_get_row_sql(
sprintf( sprintf(
@ -820,22 +823,19 @@ function inventory_get_datatable(
AND id_agent_module_inventory = %d AND id_agent_module_inventory = %d
ORDER BY utimestamp DESC', ORDER BY utimestamp DESC',
$utimestamp, $utimestamp,
$row['id_agent_module_inventory'] $agent_row['id_agent_module_inventory']
) )
); );
if ($data_row !== false) { if ($data_row !== false) {
$row['data'] = $data_row['data']; $data_agent[$key]['data'] = $data_row['data'];
$row['timestamp'] = $data_row['timestamp'];
$row['utimestamp'] = $data_row['utimestamp'];
} else { } else {
continue; continue;
} }
} }
} }
$rows[0]['timestamp'] = $row['timestamp']; $rows_tmp['row'] = $data_agent;
$rows_tmp['row'] = $rows;
array_push($agents_rows, $rows_tmp); array_push($agents_rows, $rows_tmp);
} }