Fixed saml problems

This commit is contained in:
Arturo Gonzalez 2016-05-18 12:10:29 +02:00
parent b98056b65a
commit 35a5d2a5de

View File

@ -288,14 +288,14 @@ if (! isset ($config['id_user'])) {
$nick_in_db = $_SESSION["prepared_login_da"]['id_user']; $nick_in_db = $_SESSION["prepared_login_da"]['id_user'];
$expired_pass = false; $expired_pass = false;
} }
else if (($config['auth'] == 'saml') && $login_button_saml) { else if (($config['auth'] == 'saml') && $login_button_saml && !is_user_admin($nick)) {
if (is_user_admin($nick)) { include_once(ENTERPRISE_DIR . "/include/auth/saml.php");
$nick_in_db = $nick; $saml_user_id = saml_process_user_login();
} $nick_in_db = $saml_user_id;
else { if (!$nick_in_db) {
include_once(ENTERPRISE_DIR . "/include/auth/saml.php"); require_once('/opt/simplesamlphp/lib/_autoload.php');
$saml_user_id = saml_process_user_login(); $as = new SimpleSAML_Auth_Simple('example-userpass');
$nick_in_db = $saml_user_id; $as->logout();
} }
} }
else { else {