From ca427679447d7755a7fdd4e45ffd51c929745ff6 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 6 Oct 2010 14:37:33 +0000 Subject: [PATCH] 2010-10-06 Miguel de Dios * include/functions_config.php: added in function "process_config" added lines code to check unset 'autoupdate' in $config. * operation/incidents/incident_statistics.php, godmode/users/user_list.php: cleaned source code style. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 +++++++ pandora_console/godmode/users/user_list.php | 3 ++- pandora_console/include/functions_config.php | 4 ++++ .../incidents/incident_statistics.php | 21 ++++++++++++------- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 3b20264d7e..6cc942b88c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2010-10-06 Miguel de Dios + + * include/functions_config.php: added in function "process_config" added + lines code to check unset 'autoupdate' in $config. + + * operation/incidents/incident_statistics.php, godmode/users/user_list.php: + cleaned source code style. + 2010-10-06 Miguel de Dios * operation/agentes/status_monitor.php, diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index a3010f77d9..ba986916b7 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -209,7 +209,8 @@ if ($config["admin_can_add_user"] !== false) { print_input_hidden ('new_user', 1); print_submit_button (__('Create user'), "crt", false, 'class="sub next"'); echo ''; -} else { +} +else { echo ''.__('The current authentication scheme doesn\'t support creating users from Pandora FMS').''; } echo ''; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index f9d06aa999..da9da38b59 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -559,6 +559,10 @@ function process_config () { if (!isset ($config['rintegria_pass'])) { update_config_value ( 'rintegria_pass', ''); } + + if (!isset ($config['autoupdate'])) { + update_config_value ( 'autoupdate', 0); + } /* Finally, check if any value was overwritten in a form */ update_config (); diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php index 97e079c5a1..9ad0e9006e 100644 --- a/pandora_console/operation/incidents/incident_statistics.php +++ b/pandora_console/operation/incidents/incident_statistics.php @@ -31,31 +31,36 @@ echo ''; } echo ''; } echo ''; } echo ''; } echo ''; } echo '

'.__('Incidents by status').'

'; if ($config['flash_charts']) { echo graph_incidents_status (); -} else { +} +else { echo '

'.__('Incidents by priority').'

'; if ($config['flash_charts']) { echo grafico_incidente_prioridad (); -} else { +} +else { echo '

'.__('Incidents by group').'

'; if ($config['flash_charts']) { - echo graphic_incident_group (); -} else { + echo grafico_incidente_prioridad (); +} +else { echo '

'.__('Incidents by user').'

'; if ($config['flash_charts']) { - echo graphic_incident_user (); -} else { + echo grafico_incidente_prioridad (); +} +else { echo '

'.__('Incidents by source').'

'; if ($config['flash_charts']) { - echo graphic_incident_source (); -} else { + echo grafico_incidente_prioridad (); +} +else { echo '
';