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

2010-10-07 Sergio Martin <sergio.martin@artica.es> 

* include/fgraph.php: Fixed crash when try to render 
	a graph without data



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3359 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-10-07 08:46:13 +00:00
parent 0f614e8f63
commit 304b165ddc
2 changed files with 10 additions and 4 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-10-07 Sergio Martin <sergio.martin@artica.es>
* include/fgraph.php: Fixed crash when try to render
a graph without data
2010-10-07 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_edit_agents.php: Removed the IP

9
pandora_console/include/fgraph.php
View File

@ -228,7 +228,10 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
$min_necessary = 2;
}
// Set initial conditions
$graph_values[$i] = array();
// Check available data
if (count ($data) < $min_necessary) {
continue;
@ -240,8 +243,6 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
// Event iterator
$k = 0;
// Set initial conditions
$graph_values[$i] = array();
if ($data[0]['utimestamp'] == $datelimit) {
$previous_data = $data[0]['datos'];
$j++;
@ -324,7 +325,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
$title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2));
$time_format = 'M j';
}
if (! $graphic_type) {
return fs_combined_chart ($graph_values, $graph, $module_name_list, $width, $height, $stacked, $resolution / 10, $time_format);
}