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

Merge branch '1255-Opcion-para-tener-Alias-as-name-por-defecto-4463-vodat' into 'develop' 

Use alias as name with option default tconfig - #1255

See merge request !803
This commit is contained in:
vgilc 2017-10-04 15:52:17 +02:00
parent aaa21d2bd8 74e4ae3f71
commit 13f12baa33
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/agentes/agent_manager.php
View File

@ -205,7 +205,7 @@ if (!$new_agent) {
$table->data[1][0] = __('Alias');
$table->data[1][1] = html_print_input_text ('alias', $alias, '', 50, 100, true);
if($new_agent){
$table->data[1][1] .= html_print_checkbox ("alias_as_name", 1, $alias_as_name, true).__('Use alias as name');
$table->data[1][1] .= html_print_checkbox ("alias_as_name", 1, $config['alias_as_name'], true).__('Use alias as name');
}
$table->data[2][0] = __('IP Address');

4
pandora_console/godmode/setup/setup_general.php
View File

@ -222,6 +222,10 @@ $table->data[37][0] = __('audit log directory') .
ui_print_help_tip (__("Directory where audit log is stored."), true);
$table->data[37][1] = html_print_input_text ('auditdir', io_safe_output($config["auditdir"]), '', 30, 100, true);
$table->data[38][0] = __('To use alias as name when creating agent');
$table->data[38][1] = __('Yes').'   '.html_print_radio_button ('alias_as_name', 1, '', $config["alias_as_name"], true).'  ';
$table->data[38][1] .= __('No').'   '.html_print_radio_button ('alias_as_name', 0, '', $config["alias_as_name"], true);
echo '<form id="form_setup" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general&amp;pure='.$config['pure'].'">';
echo "<fieldset>";

6
pandora_console/include/functions_config.php
View File

@ -206,6 +206,8 @@ function config_update_config () {
$error_update[] = __('Identification_reminder');
if (!config_update_value ('include_agents', (bool)get_parameter('include_agents')))
$error_update[] = __('Include_agents');
if (!config_update_value ('alias_as_name', get_parameter('alias_as_name')))
$error_update[] = __('alias_as_name');
if (!config_update_value ('auditdir', get_parameter('auditdir')))
$error_update[] = __('Audit log directory');
break;
@ -1015,6 +1017,10 @@ function config_process_config () {
if (!isset ($config["include_agents"])) {
config_update_value ('include_agents', 0);
}
if (!isset ($config["alias_as_name"])) {
config_update_value ('alias_as_name', 0);
}
if (!isset ($config["auditdir"])) {
config_update_value ('auditdir',"/var/www/html/pandora_console");