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

Merge branch '385-api_reports_no_data' into 'pandora_6.0'

Browse Source 
Fixed api get module data. Ticket #385

See merge request !213
This commit is contained in:
vgilc 2017-02-27 15:37:03 +01:00
commit a2c4d4a2e0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/functions_api.php
View File

@ -5914,10 +5914,18 @@ function api_get_module_data($id, $thrash1, $other, $returnType) {
ORDER BY utimestamp DESC", $id, $date_start, $date_end); ORDER BY utimestamp DESC", $id, $date_start, $date_end);
} }
else { else {
$sql = sprintf ("SELECT utimestamp, datos if ($periodSeconds == null) {
FROM tagente_datos $sql = sprintf ("SELECT utimestamp, datos
WHERE id_agente_modulo = %d AND utimestamp > %d FROM tagente_datos
ORDER BY utimestamp DESC", $id, get_system_time () - $periodSeconds); WHERE id_agente_modulo = %d
ORDER BY utimestamp DESC", $id);
}
else {
$sql = sprintf ("SELECT utimestamp, datos
FROM tagente_datos
WHERE id_agente_modulo = %d AND utimestamp > %d
ORDER BY utimestamp DESC", $id, get_system_time () - $periodSeconds);
}
} }
$data['type'] = 'array'; $data['type'] = 'array';