tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
fbsanchez 2020-12-11 11:31:18 +01:00
parent 79c8c852b3
commit 4d2b890712
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pandora_console/include/auth/mysql.php
View File

@ -68,27 +68,33 @@ $config['admin_can_make_admin'] = true;
/** /**
* process_user_login accepts $login and $pass and handles it according to current authentication scheme * Process_user_login accepts $login and $pass and handles it according to
* current authentication scheme.
* *
* @param string $login * @param string $login Login.
* @param string $pass * @param string $pass Pass.
* @param boolean $api * @param boolean $api Api.
* *
* @return mixed False in case of error or invalid credentials, the username in case it's correct. * @return mixed False in case of error or invalid credentials, the username in
* case it's correct.
*/ */
function process_user_login($login, $pass, $api=false) function process_user_login($login, $pass, $api=false)
{ {
global $config, $mysql_cache; global $config;
// 1. Try remote. // 1. Try remote.
$login_remote = process_user_login_remote( if (strtolower($config['auth']) != 'mysql') {
$login, $login_remote = process_user_login_remote(
io_safe_output($pass), $login,
$api io_safe_output($pass),
); $api
);
} else {
$login_remote = false;
}
// 2. Try local. // 2. Try local.
if ($login_remote == false if ($login_remote === false
&& ($config['fallback_local_auth'] || is_user_admin($login)) && ($config['fallback_local_auth'] || is_user_admin($login))
) { ) {
return process_user_login_local($login, $pass, $api); return process_user_login_local($login, $pass, $api);