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

Add default value of field advance ad configuration. Gitlab: #367

This commit is contained in:
m-lopez-f 2017-02-27 11:26:48 +01:00
parent fc7e2f69b7
commit 070db42c41
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/auth/mysql.php
View File

@ -268,7 +268,9 @@ function process_user_login_remote ($login, $pass, $api = false) {
return false;
}
if ($config["auth"] === 'ad' && (isset($config['ad_advanced_config']) && $config['ad_advanced_config'])) {
if ($config["auth"] === 'ad' &&
(isset($config['ad_advanced_config']) &&
$config['ad_advanced_config'])) {
if ( defined('METACONSOLE') ) {

4
pandora_console/include/functions_config.php
View File

@ -1253,6 +1253,10 @@ function config_process_config () {
config_update_value ( 'ad_advanced_config', 0);
}
if (!isset ($config['ad_adv_user_node'])) {
config_update_value ( 'ad_adv_user_node', 1);
}
if (!isset ($config['ad_domain'])) {
config_update_value ( 'ad_domain', '');
}

2
pandora_console/include/functions_profile.php
View File

@ -95,7 +95,7 @@ function profile_create_user_profile ($id_user,
}
if ($assignUser !== false)
$assign = $assignUser;
$assign = $assignUser;
$insert = array (
"id_usuario" => $id_user,