From 2924fd42f50d4fd0dc93f3f2927a745d22bea2cd Mon Sep 17 00:00:00 2001 From: javilanz Date: Mon, 11 Apr 2011 15:43:45 +0000 Subject: [PATCH] 2011-04-11 Javier Lanz * include/functions_reporting.php: Fixed a typo error * operation/agentes/exportdata.php: Added a couple of safe_outputs * operation/reporting/custom_reporting.php: Added CSV column and its icon, changed table width git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4183 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/functions_reporting.php | 2 +- pandora_console/operation/agentes/exportdata.php | 4 ++-- pandora_console/operation/reporting/custom_reporting.php | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ce456e40ea..f6d0976830 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2011-04-11 Javier Lanz + + * include/functions_reporting.php: Fixed a typo error + * operation/agentes/exportdata.php: Added a couple of safe_outputs + * operation/reporting/custom_reporting.php: Added CSV column and its + icon, changed table width + 2011-04-11 Sergio Martin * include/graphs/functions_pchart.php diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index a744d979eb..3b50b26e23 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -3055,7 +3055,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) { $data[0] .= ' - '.__('Modules at normal status'); break; case 4: - $data[0] .= ' - '.__('Modules at critial or warning status'); + $data[0] .= ' - '.__('Modules at critical or warning status'); break; } $data[0].=$sizhfin; diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php index 6ae6220cb3..1ff0984bab 100644 --- a/pandora_console/operation/agentes/exportdata.php +++ b/pandora_console/operation/agentes/exportdata.php @@ -218,9 +218,9 @@ if (!empty ($export_btn) && !empty ($module)) { */ foreach ($data as $key => $module) { $output .= $rowstart; - $output .= $module['agent_name']; + $output .= safe_output($module['agent_name']); $output .= $divider; - $output .= $module['module_name']; + $output .= safe_output($module['module_name']); $output .= $divider; $output .= $module['data']; $output .= $divider; diff --git a/pandora_console/operation/reporting/custom_reporting.php b/pandora_console/operation/reporting/custom_reporting.php index c84e830235..e45b83eb71 100644 --- a/pandora_console/operation/reporting/custom_reporting.php +++ b/pandora_console/operation/reporting/custom_reporting.php @@ -33,7 +33,7 @@ if (sizeof ($reports) == 0) { return; } -$table->width = '580px'; +$table->width = '90%'; $table->head = array (); $table->head[0] = __('Report name'); $table->head[1] = __('Description'); @@ -46,6 +46,7 @@ $table->align = array (); $table->align[2] = 'center'; $table->align[3] = 'center'; $table->align[4] = 'center'; +$table->align[5] = 'center'; $table->data = array (); foreach ($reports as $report) { @@ -64,6 +65,5 @@ foreach ($reports as $report) { enterprise_hook ('load_custom_reporting_2'); array_push ($table->data, $data); } - print_table ($table); ?>