Merge branch 'ent-8734-deshacer-cambios-de-autenticacion-de-global-admin' into 'develop'
reverted changes See merge request artica/pandorafms!4772
This commit is contained in:
commit
906e9ecd7a
|
@ -226,11 +226,6 @@ function process_user_login_remote($login, $pass, $api=false)
|
||||||
switch ($config['auth']) {
|
switch ($config['auth']) {
|
||||||
// LDAP
|
// LDAP
|
||||||
case 'ldap':
|
case 'ldap':
|
||||||
// Use local authentication if user is global admin.
|
|
||||||
if (is_user_admin($login) === true) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$sr = ldap_process_user_login($login, $pass);
|
$sr = ldap_process_user_login($login, $pass);
|
||||||
|
|
||||||
if (!$sr) {
|
if (!$sr) {
|
||||||
|
@ -240,11 +235,6 @@ function process_user_login_remote($login, $pass, $api=false)
|
||||||
|
|
||||||
// Active Directory
|
// Active Directory
|
||||||
case 'ad':
|
case 'ad':
|
||||||
// Use local authentication if user is global admin.
|
|
||||||
if (is_user_admin($login) === true) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (enterprise_hook('ad_process_user_login', [$login, $pass]) === false) {
|
if (enterprise_hook('ad_process_user_login', [$login, $pass]) === false) {
|
||||||
$config['auth_error'] = 'User not found in database or incorrect password';
|
$config['auth_error'] = 'User not found in database or incorrect password';
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue