From f53a2c993e61f68d3bc7a234cd455f803f8c9d8d Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Fri, 1 Feb 2013 12:53:33 +0000 Subject: [PATCH] 2013-02-01 Sergio Martin * include/functions_ui.php include/functions_treeview.php: Delete server from detail of modules in treeview and other little fixes * include/functions_config.php: Added autocreation of some conf tokens when dont exist * include/help/en/help_events_replication.php include/help/es/help_events_replication.php: Added more info in the events replication help text git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7561 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 13 +++++++++++++ pandora_console/include/functions_config.php | 14 ++++++++++++++ pandora_console/include/functions_treeview.php | 6 ------ pandora_console/include/functions_ui.php | 4 ++-- .../include/help/en/help_events_replication.php | 5 +++++ .../include/help/es/help_events_replication.php | 5 +++++ 6 files changed, 39 insertions(+), 8 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f6c9f2247b..3dbbd2bff0 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2013-02-01 Sergio Martin + + * include/functions_ui.php + include/functions_treeview.php: Delete server from + detail of modules in treeview and other little fixes + + * include/functions_config.php: Added autocreation + of some conf tokens when dont exist + + * include/help/en/help_events_replication.php + include/help/es/help_events_replication.php: Added + more info in the events replication help text + 2013-02-01 Miguel de Dios * godmode/reporting/reporting_builder.php, diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index b031e7ea95..95900d56dd 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -608,6 +608,10 @@ function config_process_config () { if (!isset ($config['netflow_max_resolution'])) { config_update_value ( 'netflow_max_resolution', '50'); } + + if (!isset ($config['netflow_disable_custom_lvfilters'])) { + config_update_value('netflow_disable_custom_lvfilters', 100); + } if (!isset ($config['auth'])) { config_update_value ( 'auth', 'mysql'); @@ -753,6 +757,16 @@ function config_process_config () { config_update_value( 'api_password', ''); } + if(defined('METACONSOLE')) { + if (!isset ($config['show_vc'])) { + config_update_value('show_vc', 1); + } + + if (!isset ($config['meta_num_elements'])) { + config_update_value('meta_num_elements', 100); + } + } + if (!isset ($config['relative_path']) && (isset ($_POST['nick']) || isset ($config['id_user'])) && isset($config['enterprise_installed'])) { diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index 7421855d09..8ad6316516 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -67,12 +67,6 @@ function treeview_printModuleTable($id_module, $server_data = false) { echo ''.$cellName.''; - // Server - echo ''.__('Server').''; - echo ''; - echo $server_data['server_name']; - echo ''; - // Parent echo ''.__('Module group').''; echo ''; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 15333bcf2b..381cf11e64 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -243,7 +243,7 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa $id = 'info_box_' . uniqid(); $output = ' + class="info_box ' . $id . ' ' . $class . '" style="' . $force_style . '"> @@ -268,7 +268,7 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa $output .= ' '; diff --git a/pandora_console/include/help/en/help_events_replication.php b/pandora_console/include/help/en/help_events_replication.php index 3d08bcb508..e8b8929a54 100644 --- a/pandora_console/include/help/en/help_events_replication.php +++ b/pandora_console/include/help/en/help_events_replication.php @@ -12,5 +12,10 @@ Is necessary configurate the credentials of the metaconsole database, the replic The event viewer will be disabled when this option is activated.

To be effective the changes on the events replication configuration will be necessary restart the server. +

+The server configuration file must has token: + +event_replication 1 +

diff --git a/pandora_console/include/help/es/help_events_replication.php b/pandora_console/include/help/es/help_events_replication.php index d9fb481f18..81a0ff9e20 100644 --- a/pandora_console/include/help/es/help_events_replication.php +++ b/pandora_console/include/help/es/help_events_replication.php @@ -12,5 +12,10 @@ Es necesario configurar las credenciales de la base de datos de la metaconsola, El visor de eventos se deshabilita cuando se activa esta opción.

Para que los cambios en la configuración de replicación de eventos se hagan efectivos será necesario reiniciar el servidor. +

+El fichero de configuración del servidor deberá tener el token: + +event_replication 1 +

' . html_print_image($icon_image, true) . ' ' . $text_title . '