tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-02-01 Sergio Martin <sergio.martin@artica.es> 

* 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
This commit is contained in:
zarzuelo 2013-02-01 12:53:33 +00:00
parent 39bc2507ab
commit f53a2c993e
6 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/ChangeLog
View File

@ -1,3 +1,16 @@
2013-02-01 Sergio Martin <sergio.martin@artica.es>
* 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 <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php,

14
pandora_console/include/functions_config.php
View File

@ -609,6 +609,10 @@ function config_process_config () {
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'])) {

6
pandora_console/include/functions_treeview.php
View File

@ -67,12 +67,6 @@ function treeview_printModuleTable($id_module, $server_data = false) {
echo '<td class="datos"><b>'.$cellName.'</b></td>';
// Server
echo '<tr><td class="datos2"><b>'.__('Server').'</b></td>';
echo '<td class="datos2" colspan="2">';
echo $server_data['server_name'];
echo '</td></tr>';
// Parent
echo '<tr><td class="datos2"><b>'.__('Module group').'</b></td>';
echo '<td class="datos2" colspan="2">';

4
pandora_console/include/functions_ui.php
View File

@ -243,7 +243,7 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa
$id = 'info_box_' . uniqid();
$output = '<table cellspacing="0" cellpadding="0" id="' . $id . '" ' . $attributes . '
class="info_box ' . $class . '" style="' . $force_style . '">
class="info_box ' . $id . ' ' . $class . '" style="' . $force_style . '">
<tr>
<td class="icon">' . html_print_image($icon_image, true) . '</td>
<td class="title"><b>' . $text_title . '</b></td>
@ -268,7 +268,7 @@ function ui_print_message ($message, $class = '', $attributes = '', $return = fa
$output .= '
<script type="text/javascript">
function close_info_box(id) {
$("#" + id).hide();
$("." + id).hide();
}
</script>
';

5
pandora_console/include/help/en/help_events_replication.php
View File

@ -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.
<br><br>
To be effective the changes on the events replication configuration will be necessary restart the server.
<br><br>
The server configuration file must has token:
<i>event_replication 1</i>
</p>

5
pandora_console/include/help/es/help_events_replication.php
View File

@ -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.
<br><br>
Para que los cambios en la configuración de replicación de eventos se hagan efectivos será necesario reiniciar el servidor.
<br><br>
El fichero de configuración del servidor deberá tener el token:
<i>event_replication 1</i>
</p>