mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-23 22:05:41 +02:00
2011-04-11 Javier Lanz <javier.lanz@artica.es>
* 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
This commit is contained in:
parent
65338bb1c5
commit
1d24bb865e
@ -1,3 +1,10 @@
|
|||||||
|
2011-04-11 Javier Lanz <javier.lanz@artica.es>
|
||||||
|
|
||||||
|
* 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 <sergio.martin@artica.es>
|
2011-04-11 Sergio Martin <sergio.martin@artica.es>
|
||||||
|
|
||||||
* include/graphs/functions_pchart.php
|
* include/graphs/functions_pchart.php
|
||||||
|
@ -3055,7 +3055,7 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
|
|||||||
$data[0] .= ' - '.__('Modules at normal status');
|
$data[0] .= ' - '.__('Modules at normal status');
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
$data[0] .= ' - '.__('Modules at critial or warning status');
|
$data[0] .= ' - '.__('Modules at critical or warning status');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
$data[0].=$sizhfin;
|
$data[0].=$sizhfin;
|
||||||
|
@ -218,9 +218,9 @@ if (!empty ($export_btn) && !empty ($module)) {
|
|||||||
*/
|
*/
|
||||||
foreach ($data as $key => $module) {
|
foreach ($data as $key => $module) {
|
||||||
$output .= $rowstart;
|
$output .= $rowstart;
|
||||||
$output .= $module['agent_name'];
|
$output .= safe_output($module['agent_name']);
|
||||||
$output .= $divider;
|
$output .= $divider;
|
||||||
$output .= $module['module_name'];
|
$output .= safe_output($module['module_name']);
|
||||||
$output .= $divider;
|
$output .= $divider;
|
||||||
$output .= $module['data'];
|
$output .= $module['data'];
|
||||||
$output .= $divider;
|
$output .= $divider;
|
||||||
|
@ -33,7 +33,7 @@ if (sizeof ($reports) == 0) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$table->width = '580px';
|
$table->width = '90%';
|
||||||
$table->head = array ();
|
$table->head = array ();
|
||||||
$table->head[0] = __('Report name');
|
$table->head[0] = __('Report name');
|
||||||
$table->head[1] = __('Description');
|
$table->head[1] = __('Description');
|
||||||
@ -46,6 +46,7 @@ $table->align = array ();
|
|||||||
$table->align[2] = 'center';
|
$table->align[2] = 'center';
|
||||||
$table->align[3] = 'center';
|
$table->align[3] = 'center';
|
||||||
$table->align[4] = 'center';
|
$table->align[4] = 'center';
|
||||||
|
$table->align[5] = 'center';
|
||||||
$table->data = array ();
|
$table->data = array ();
|
||||||
|
|
||||||
foreach ($reports as $report) {
|
foreach ($reports as $report) {
|
||||||
@ -64,6 +65,5 @@ foreach ($reports as $report) {
|
|||||||
enterprise_hook ('load_custom_reporting_2');
|
enterprise_hook ('load_custom_reporting_2');
|
||||||
array_push ($table->data, $data);
|
array_push ($table->data, $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
print_table ($table);
|
print_table ($table);
|
||||||
?>
|
?>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user