From 2a74ac042f38f9f7c15626ba5b9cf80027700b8c Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Tue, 29 Nov 2011 12:52:56 +0000 Subject: [PATCH] 2011-11-29 Juan Manuel Ramon * include/functions_graph.php: Added check for flash charts in pdf exportation. * operation/events/events_validate.php: Removed entities in this view. Fixes: #3445106 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5200 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/include/functions_graph.php | 11 ++++++----- pandora_console/operation/events/events_validate.php | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 86650a1dbe..4d9f853dbf 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2011-11-29 Juan Manuel Ramon + + * include/functions_graph.php: Added check for flash charts in pdf + exportation. + * operation/events/events_validate.php: Removed entities in this + view. + + Fixes: #3445106 + 2011-11-29 Juan Manuel Ramon * godmode/setup/setup_visuals.php: Added custom logo in visual diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 741b11fba0..04f0ce716d 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -378,11 +378,6 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $ global $config; global $graphic_type; - $flash_charts = $config['flash_charts']; - - if ($flash_charts){ - include_flash_chart_script(); - } // Set the title and time format @@ -741,9 +736,15 @@ 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; } + + if ($flash_charts){ + include_flash_chart_script(); + } switch ($stacked) { case GRAPH_AREA: diff --git a/pandora_console/operation/events/events_validate.php b/pandora_console/operation/events/events_validate.php index 02510611a7..864d2f86f0 100644 --- a/pandora_console/operation/events/events_validate.php +++ b/pandora_console/operation/events/events_validate.php @@ -84,7 +84,7 @@ foreach($ids as $key => $id) { "title" => $title_st, "id" => 'status_img_'.$event["id_evento"])); - $table->data[$key][0] = $icon." ".$event['evento']; + $table->data[$key][0] = $icon." ".io_safe_output($event['evento']); $table->align[$key][0] = 'left'; if($event['id_alert_am'] != 0) { $any_alert = true;