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

Fixed exception in datetime object. Functions api get_module_data. Ticket #378

Browse Source 
(cherry picked from commit fc7e2f69b7d0fddd569d072f35324065d8942c5e)
This commit is contained in:
Arturo Gonzalez 2017-02-27 11:05:23 +01:00
parent 023148cacb
commit 66db2e68a7
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/functions_api.php
View File

@ -5885,6 +5885,8 @@ function api_get_module_data($id, $thrash1, $other, $returnType) {
$tstart = $data[2]; $tstart = $data[2];
$tend = $data[3]; $tend = $data[3];
if (($tstart != "") && ($tend != "")) {
try {
$dateStart = explode("T", $tstart); $dateStart = explode("T", $tstart);
$dateYearStart = substr($dateStart[0], 0, 4); $dateYearStart = substr($dateStart[0], 0, 4);
$dateMonthStart = substr($dateStart[0], 4, 2); $dateMonthStart = substr($dateStart[0], 4, 2);
@ -5900,8 +5902,11 @@ function api_get_module_data($id, $thrash1, $other, $returnType) {
$date_end = $dateYearEnd . "-" . $dateMonthEnd . "-" . $dateDayEnd . " " . $dateEnd[1]; $date_end = $dateYearEnd . "-" . $dateMonthEnd . "-" . $dateDayEnd . " " . $dateEnd[1];
$date_end = new DateTime($date_end); $date_end = new DateTime($date_end);
$date_end = $date_end->format('U'); $date_end = $date_end->format('U');
}
catch (Exception $e) {
returnError('error_query_module_data', 'Error in date format. ');
}
if (($tstart != "") && ($tend != "")) {
$sql = sprintf ("SELECT utimestamp, datos $sql = sprintf ("SELECT utimestamp, datos
FROM tagente_datos FROM tagente_datos
WHERE id_agente_modulo = %d AND utimestamp > %d WHERE id_agente_modulo = %d AND utimestamp > %d
@ -5919,11 +5924,16 @@ function api_get_module_data($id, $thrash1, $other, $returnType) {
$data['list_index'] = array('utimestamp', 'datos'); $data['list_index'] = array('utimestamp', 'datos');
$data['data'] = db_get_all_rows_sql($sql); $data['data'] = db_get_all_rows_sql($sql);
if ($data === false) if ($data === false) {
returnError('error_query_module_data', 'Error in the query of module data.'); returnError('error_query_module_data', 'Error in the query of module data.');
else }
else if ($data['data'] == "") {
returnError('error_query_module_data', 'No data to show.');
}
else {
returnData('csv', $data, $separator); returnData('csv', $data, $separator);
} }
}
/** /**
* Return a image file of sparse graph of module data in a period time. * Return a image file of sparse graph of module data in a period time.