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

Fixed api get module data. Ticket #385 

(cherry picked from commit 938dc40f77)
This commit is contained in:
Arturo Gonzalez 2017-02-27 14:58:40 +01:00
parent 2ccfedf9a5
commit 6d3cb8ebc3
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';