Added some changes to SAML login system.
(cherry picked from commit 318ba4f049
)
This commit is contained in:
parent
8385e5e129
commit
f96442ba37
|
@ -295,8 +295,7 @@ if (! isset ($config['id_user'])) {
|
|||
$nick_in_db = $_SESSION["prepared_login_da"]['id_user'];
|
||||
$expired_pass = false;
|
||||
}
|
||||
else if (($config['auth'] == 'saml') && $login_button_saml) {
|
||||
if (!is_user_admin($nick)) {
|
||||
else if (($config['auth'] == 'saml') && ($login_button_saml)) {
|
||||
include_once(ENTERPRISE_DIR . "/include/auth/saml.php");
|
||||
$saml_user_id = saml_process_user_login();
|
||||
$nick_in_db = $saml_user_id;
|
||||
|
@ -306,11 +305,6 @@ if (! isset ($config['id_user'])) {
|
|||
$as->logout();
|
||||
}
|
||||
}
|
||||
else {
|
||||
$config["auth_error"] = "Error - Cannot log in as admin with 'login with saml' button";
|
||||
$nick_in_db = false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// process_user_login is a virtual function which should be defined in each auth file.
|
||||
// It accepts username and password. The rest should be internal to the auth file.
|
||||
|
|
Loading…
Reference in New Issue