Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
5af8569805
1 changed files with 6 additions and 1 deletions
|
|
@ -159,7 +159,12 @@ function check_user_password_openid_connect($usertotest, $passwordtotest, $entit
|
|||
// Success: retrieve claim to return to Dolibarr as login
|
||||
$sql = 'SELECT login, entity, datestartvalidity, dateendvalidity';
|
||||
$sql .= ' FROM '.MAIN_DB_PREFIX.'user';
|
||||
$sql .= " WHERE login = '".$db->escape($userinfo_content->$login_claim)."'";
|
||||
if ($login_claim === 'email') {
|
||||
// If login claim is email, check both login and email fields
|
||||
$sql .= " WHERE (login = '".$db->escape($userinfo_content->$login_claim)."' OR email = '".$db->escape($userinfo_content->$login_claim)."')";
|
||||
} else {
|
||||
$sql .= " WHERE login = '".$db->escape($userinfo_content->$login_claim)."'";
|
||||
}
|
||||
$sql .= ' AND entity IN (0,'.(array_key_exists('dol_entity', $_SESSION) ? ((int) $_SESSION["dol_entity"]) : 1).')';
|
||||
|
||||
dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
|
||||
|
|
|
|||
Loading…
Reference in a new issue