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

2010-11-04 Ramon Novoa <rnovoa@artica.es> 

* include/fgraph.php: Do not propagate compressed data to dates in the
	  future in any charts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3524 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2010-11-04 17:48:56 +00:00
parent 2bd122e423
commit dc0d2e144a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2010-11-04 Ramon Novoa <rnovoa@artica.es>
* include/fgraph.php: Do not propagate compressed data to dates in the
future in any charts.
2010-11-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: in function __ fixed when the Pandora don't

6
pandora_console/include/fgraph.php
View File

@ -296,7 +296,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
$previous_data = $total;
// Compressed data
} else {
if ($uncompressed_module) {
if ($uncompressed_module || ($timestamp > time ())) {
$graph_values[$i][$timestamp] = 0;
} else {
$graph_values[$i][$timestamp] = $previous_data * $weight_list[$i];
@ -1711,7 +1711,7 @@ function grafico_modulo_sparse_mobile ($agent_module_id, $period, $show_events,
$previous_data = $total;
// Compressed data
} else {
if ($uncompressed_module) {
if ($uncompressed_module || ($timestamp > time ())) {
$chart[$timestamp]['sum'] = 0;
$chart[$timestamp]['min'] = 0;
$chart[$timestamp]['max'] = 0;
@ -1950,7 +1950,7 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
$previous_data = $total;
// Compressed data
} else {
if ($uncompressed_module) {
if ($uncompressed_module || ($timestamp > time ())) {
$chart[$timestamp]['sum'] = 0;
} else {
$chart[$timestamp]['sum'] = $previous_data;