mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml-3' into 'develop'
changed condition for saml no access See merge request artica/pandorafms!2593
This commit is contained in:
commit
a752cbd2fe
@ -359,15 +359,21 @@ 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)) {
|
||||||
if (!include_once 'include/auth/saml.php') {
|
$saml_configured = include_once $config['homedir'].'/'.ENTERPRISE_DIR.'/include/auth/saml.php';
|
||||||
|
|
||||||
|
if (!$saml_configured) {
|
||||||
include_once 'general/noaccesssaml.php';
|
include_once 'general/noaccesssaml.php';
|
||||||
} else {
|
|
||||||
$saml_user_id = saml_process_user_login();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$saml_user_id = saml_process_user_login();
|
||||||
|
|
||||||
|
if (!$saml_user_id) {
|
||||||
|
include_once 'general/noaccesssaml.php';
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$nick_in_db = $saml_user_id;
|
$nick_in_db = $saml_user_id;
|
||||||
if (!$nick_in_db) {
|
if (!$nick_in_db) {
|
||||||
include_once 'general/noaccesssaml.php';
|
|
||||||
include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
|
include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
|
||||||
$as = new SimpleSAML_Auth_Simple($config['saml_source']);
|
$as = new SimpleSAML_Auth_Simple($config['saml_source']);
|
||||||
$as->logout();
|
$as->logout();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user