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

2012-01-12 Ramon Novoa <rnovoa@artica.es> 

* include/graphs/functions_fsgraph.php: Fixed empty chart detection for
	  flash charts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2012-01-12 10:55:59 +00:00
parent 2e7da2fa96
commit 3efe042a99
2 changed files with 11 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 @@
2012-01-12 Ramon Novoa <rnovoa@artica.es>
* include/graphs/functions_fsgraph.php: Fixed empty chart detection for
flash charts.
2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
godmode/netflow/nf_edit.php
godmode/netflow/nf_report.php

10
pandora_console/include/graphs/functions_fsgraph.php
View File

@ -409,7 +409,9 @@ function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_inde
$show_name = '0';
}
$empty = 0;
if ($v != 0) {
$empty = 0;
}
if ($a < 3) {
$a++;
@ -587,7 +589,7 @@ function fs_2d_column_chart ($data, $width, $height, $homeurl = '', $reduce_data
} else {
$show_name = '0';
}
if ($value > 0) {
if ($value != 0) {
$empty = 0;
}
$chart->addChartData($value, 'name=' . clean_flash_string($name) . ';showName=' . $show_name . ';color=95BB04');
@ -662,7 +664,7 @@ function fs_2d_hcolumn_chart ($data, $width, $height) {
} else {
$show_name = '0';
}
if ($value > 0) {
if ($value != 0) {
$empty = 0;
}
$chart->addChartData($value, 'name=' . clean_flash_string($name) . ';showName=' . $show_name/* . ';color=95BB04'*/);
@ -699,7 +701,7 @@ function fs_3d_column_chart ($data, $width, $height) {
} else {
$show_name = '0';
}
if ($value > 0) {
if ($value != 0) {
$empty = 0;
}
$chart->addChartData($value, 'name=' . clean_flash_string($name) . ';showName=' . $show_name . ';color=95BB04');