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

2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

Browse Source 
* include/functions_graph.php
	 include/functions_reporting.php: Fixed custom graphs in preview 
	 reporting and PDF exportation.
	 
	 Fixes: #3444170



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5196 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-29 11:39:50 +00:00
parent 079892b644
commit 53c8ca2fc0
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
include/functions_reporting.php: Fixed custom graphs in preview
reporting and PDF exportation.
Fixes: #3444170
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/snmpconsole/snmp_view.php: Fixed trap validation when * operation/snmpconsole/snmp_view.php: Fixed trap validation when

10
pandora_console/include/functions_graph.php
View File

@ -378,7 +378,11 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
global $config; global $config;
global $graphic_type; global $graphic_type;
include_flash_chart_script(); $flash_charts = $config['flash_charts'];
if ($flash_charts){
include_flash_chart_script();
}
// Set the title and time format // Set the title and time format
@ -737,12 +741,10 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
$time_format = 'M j'; $time_format = 'M j';
} }
$flash_charts = $config['flash_charts'];
if ($only_image) { if ($only_image) {
$flash_charts = false; $flash_charts = false;
} }
switch ($stacked) { switch ($stacked) {
case GRAPH_AREA: case GRAPH_AREA:
$color = null; $color = null;

3
pandora_console/include/functions_reporting.php
View File

@ -2263,7 +2263,8 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
0, 0,
0, 0,
$graph["stacked"], $graph["stacked"],
$report["datetime"]); $report["datetime"],
true);
array_push ($table->data, $data); array_push ($table->data, $data);
break; break;