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

Merge branch '635-moved-reset-password-token-in-setup-dev' into 'develop' 

Moved from ent to password

See merge request !521
This commit is contained in:
vgilc 2017-05-29 12:31:24 +02:00
parent 0fe95248c1 9133f2edca
commit 2664067813
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_config.php
View File

@ -245,8 +245,6 @@ function config_update_config () {
$error_update[] = __('Metaconsole agent cache');
if (!config_update_value ('log_collector', (bool)get_parameter('log_collector')))
$error_update[] = __('Activate Log Collector');
if (!config_update_value ('reset_pass_option', (bool)get_parameter('reset_pass_option')))
$error_update[] = __('Activate reset password');
$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
if (!config_update_value ('inventory_changes_blacklist', implode(',',$inventory_changes_blacklist)))
@ -292,6 +290,8 @@ function config_update_config () {
$error_update[] = __('Enable password history');
if (!config_update_value ('compare_pass', get_parameter('compare_pass')))
$error_update[] = __('Compare previous password');
if (!config_update_value ('reset_pass_option', (bool)get_parameter('reset_pass_option')))
$error_update[] = __('Activate reset password');
}
break;
case 'auth':