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

Merge branch '378-Exception_in_get_module_data_api' into 'pandora_6.0'

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

See merge request !206
This commit is contained in:
vgilc 2017-02-27 11:58:08 +01:00
commit 2ccfedf9a5
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pandora_console/include/functions_api.php
View File

@ -5878,30 +5878,35 @@ function api_get_module_data($id, $thrash1, $other, $returnType) {
if (defined ('METACONSOLE')) { if (defined ('METACONSOLE')) {
return; return;
} }
$data = explode("|", $other['data']); $data = explode("|", $other['data']);
$separator = $data[0]; $separator = $data[0];
$periodSeconds = $data[1]; $periodSeconds = $data[1];
$tstart = $data[2]; $tstart = $data[2];
$tend = $data[3]; $tend = $data[3];
$dateStart = explode("T", $tstart);
$dateYearStart = substr($dateStart[0], 0, 4);
$dateMonthStart = substr($dateStart[0], 4, 2);
$dateDayStart = substr($dateStart[0], 6, 2);
$date_start = $dateYearStart . "-" . $dateMonthStart . "-" . $dateDayStart . " " . $dateStart[1];
$date_start = new DateTime($date_start);
$date_start = $date_start->format('U');
$dateEnd = explode("T", $tend);
$dateYearEnd = substr($dateEnd[0], 0, 4);
$dateMonthEnd = substr($dateEnd[0], 4, 2);
$dateDayEnd = substr($dateEnd[0], 6, 2);
$date_end = $dateYearEnd . "-" . $dateMonthEnd . "-" . $dateDayEnd . " " . $dateEnd[1];
$date_end = new DateTime($date_end);
$date_end = $date_end->format('U');
if (($tstart != "") && ($tend != "")) { if (($tstart != "") && ($tend != "")) {
try {
$dateStart = explode("T", $tstart);
$dateYearStart = substr($dateStart[0], 0, 4);
$dateMonthStart = substr($dateStart[0], 4, 2);
$dateDayStart = substr($dateStart[0], 6, 2);
$date_start = $dateYearStart . "-" . $dateMonthStart . "-" . $dateDayStart . " " . $dateStart[1];
$date_start = new DateTime($date_start);
$date_start = $date_start->format('U');
$dateEnd = explode("T", $tend);
$dateYearEnd = substr($dateEnd[0], 0, 4);
$dateMonthEnd = substr($dateEnd[0], 4, 2);
$dateDayEnd = substr($dateEnd[0], 6, 2);
$date_end = $dateYearEnd . "-" . $dateMonthEnd . "-" . $dateDayEnd . " " . $dateEnd[1];
$date_end = new DateTime($date_end);
$date_end = $date_end->format('U');
}
catch (Exception $e) {
returnError('error_query_module_data', 'Error in date format. ');
}
$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,10 +5924,15 @@ 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);
}
} }
/** /**