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

Modified the timestamp according to input data. Added query with the timestamp of the filter.

This commit is contained in:
miguel angel rasteu 2023-04-18 09:52:59 +02:00
parent e495f79de8
commit 9da8e83633
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/include/functions_inventory.php
View File

@ -741,15 +741,23 @@ function inventory_get_datatable(
array_push($where, "tagent_module_inventory.data LIKE '%".$inventory_search_string."%'"); array_push($where, "tagent_module_inventory.data LIKE '%".$inventory_search_string."%'");
} }
if ($utimestamp > 0) {
array_push($where, 'tagente_datos_inventory.utimestamp <= '.$utimestamp.' ');
}
$sql = sprintf( $sql = sprintf(
'SELECT tmodule_inventory.*, 'SELECT tmodule_inventory.*,
tagent_module_inventory.*, tagent_module_inventory.*,
tagente.alias as name_agent tagente.alias as name_agent,
tagente_datos_inventory.utimestamp as last_update,
tagente_datos_inventory.timestamp as last_update_timestamp
FROM tmodule_inventory FROM tmodule_inventory
INNER JOIN tagent_module_inventory INNER JOIN tagent_module_inventory
ON tmodule_inventory.id_module_inventory = tagent_module_inventory.id_module_inventory ON tmodule_inventory.id_module_inventory = tagent_module_inventory.id_module_inventory
LEFT JOIN tagente LEFT JOIN tagente
ON tagente.id_agente = tagent_module_inventory.id_agente ON tagente.id_agente = tagent_module_inventory.id_agente
LEFT JOIN tagente_datos_inventory
ON tagent_module_inventory.id_agent_module_inventory = tagente_datos_inventory.id_agent_module_inventory
WHERE %s WHERE %s
ORDER BY tmodule_inventory.id_module_inventory ORDER BY tmodule_inventory.id_module_inventory
LIMIT %d, %d', LIMIT %d, %d',
@ -763,6 +771,10 @@ function inventory_get_datatable(
if ($order_by_agent === false) { if ($order_by_agent === false) {
$modules = []; $modules = [];
foreach ($rows as $row) { foreach ($rows as $row) {
if ($row['utimestamp'] !== $row['last_update']) {
$row['timestamp'] = $row['last_update_timestamp'];
}
$data_rows = explode(PHP_EOL, $row['data']); $data_rows = explode(PHP_EOL, $row['data']);
foreach ($data_rows as $data_key => $data_value) { foreach ($data_rows as $data_key => $data_value) {
if (empty($data_value) === false) { if (empty($data_value) === false) {
@ -894,16 +906,16 @@ function inventory_get_dates($module_inventory_name, $inventory_agent, $inventor
AND tagente_datos_inventory.id_agent_module_inventory = tagent_module_inventory.id_agent_module_inventory AND tagente_datos_inventory.id_agent_module_inventory = tagent_module_inventory.id_agent_module_inventory
AND tagente.id_agente = tagent_module_inventory.id_agente'; AND tagente.id_agente = tagent_module_inventory.id_agente';
if ($inventory_agent != 0) { if ($inventory_agent !== 'All') {
$sql .= ' AND tagent_module_inventory.id_agente IN ('."'".implode(',', (array) $inventory_agent)."'".')'; $sql .= ' AND tagent_module_inventory.id_agente IN ('."'".implode(',', (array) $inventory_agent)."'".')';
} }
if ($inventory_id_group != 0) { if ($inventory_id_group !== 0) {
$sql .= " AND tagente.id_grupo = $inventory_id_group"; $sql .= " AND tagente.id_grupo = $inventory_id_group";
} }
if (is_string($module_inventory_name) === true if (is_string($module_inventory_name) === true
&& $module_inventory_name != 'all' && $module_inventory_name !== '0'
) { ) {
$sql .= " AND tmodule_inventory.name IN ('".str_replace(',', "','", $module_inventory_name)."')"; $sql .= " AND tmodule_inventory.name IN ('".str_replace(',', "','", $module_inventory_name)."')";
} }

9
pandora_console/operation/agentes/agent_inventory.php
View File

@ -232,7 +232,14 @@ foreach ($rows as $row) {
$table->cellspacing = 4; $table->cellspacing = 4;
$table->class = 'info_table'; $table->class = 'info_table';
$table->head = []; $table->head = [];
$table->head[0] = $row['name'].' - ('.date($config['date_format'], $row['utimestamp']).')';
if ($row['utimestamp'] === '0' && $utimestamp === 0) {
$table->head[0] = $row['name'];
} else if ($utimestamp === 0) {
$table->head[0] = $row['name'].' - (Last update '.date($config['date_format'], $row['utimestamp']).')';
} else {
$table->head[0] = $row['name'].' - ('.date($config['date_format'], $utimestamp).')';
}
if ((bool) $row['block_mode'] === true) { if ((bool) $row['block_mode'] === true) {
$table->head[0] .= '&nbsp;&nbsp;&nbsp;<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente='.$id_agente.'&utimestamp='.$utimestamp.'&id_agent_module_inventory='.$row['id_agent_module_inventory'].'&diff_view=1">'.html_print_image( $table->head[0] .= '&nbsp;&nbsp;&nbsp;<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente='.$id_agente.'&utimestamp='.$utimestamp.'&id_agent_module_inventory='.$row['id_agent_module_inventory'].'&diff_view=1">'.html_print_image(