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

Fixed problems with order data in custom graphs 

(cherry picked from commit 093d9ad313)
This commit is contained in:
m-lopez-f 2016-03-09 15:59:36 +01:00
parent e2ad075152
commit 4af3b2b1aa
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_graph.php
View File

@ -1428,7 +1428,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
FROM tagente_datos
WHERE id_agente_modulo = ' . (int) $module .
' AND utimestamp > ' . (int) $datelimit .
' AND utimestamp < ' . (int) $date);
' AND utimestamp < ' . (int) $date) .
" ORDER BY utimestamp DESC";
if ($temp_data) {
if (is_numeric($temp_data))
@ -1483,7 +1484,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
FROM tagente_datos
WHERE id_agente_modulo = ' . (int) $module .
' AND utimestamp > ' . (int) $datelimit .
' AND utimestamp < ' . (int) $date);
' AND utimestamp < ' . (int) $date) .
" ORDER BY utimestamp DESC";
$agent_name = io_safe_output(
modules_get_agentmodule_agent_name ($module));
@ -1524,7 +1526,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
FROM tagente_datos
WHERE id_agente_modulo = ' . (int) $module .
' AND utimestamp > ' . (int) $datelimit .
' AND utimestamp < ' . (int) $date);
' AND utimestamp < ' . (int) $date) .
" ORDER BY utimestamp DESC";
if ( $temp_data ){
if (is_numeric($temp_data))
$value = $temp_data;
@ -1576,7 +1579,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
FROM tagente_datos
WHERE id_agente_modulo = ' . (int) $module .
' AND utimestamp > ' . (int) $datelimit .
' AND utimestamp < ' . (int) $date);
' AND utimestamp < ' . (int) $date) .
" ORDER BY utimestamp DESC";
if ( $temp_data ) {
if (is_numeric($temp_data))
$value = $temp_data;