From 53c8ca2fc004de6c4362a6dcff35f3dbf1161e07 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Tue, 29 Nov 2011 11:39:50 +0000 Subject: [PATCH] 2011-11-29 Juan Manuel Ramon * 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 --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/include/functions_graph.php | 10 ++++++---- pandora_console/include/functions_reporting.php | 3 ++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f43c144304..ba2de4208c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2011-11-29 Juan Manuel Ramon + + * 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 * operation/snmpconsole/snmp_view.php: Fixed trap validation when diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index aa2b41b174..741b11fba0 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -378,7 +378,11 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $ global $config; 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 @@ -737,12 +741,10 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $ $time_format = 'M j'; } - $flash_charts = $config['flash_charts']; - if ($only_image) { $flash_charts = false; } - + switch ($stacked) { case GRAPH_AREA: $color = null; diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index b7bb395bc0..c47383a9c4 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -2263,7 +2263,8 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f 0, 0, $graph["stacked"], - $report["datetime"]); + $report["datetime"], + true); array_push ($table->data, $data); break;