Pro-Idler/AccountHub
1
0
Fork 0
forked from Business/AccountHub
Code Issues Pull Requests Projects Releases Wiki Activity

Fix "server error" message with incorrect username

Browse Source
This commit is contained in:
Skylar Ittner 2017-12-15 14:59:55 -07:00
parent 6bf1606997
commit fec5e13415
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/nbproject/private
*.sync-conflict*
test*
/conf/

4
index.php
View File

@ -50,9 +50,9 @@ if ($VARS['progress'] == "1") {
default:
if (!is_empty($error)) {
$alert = $error;
break;
} else {
$alert = lang("login error", false);
}
$alert = lang("login error", false);
break;
}
if ($username_ok) {

22
lib/login.php
View File

@ -127,19 +127,19 @@ function change_password($old, $new, $new2, &$error) {
function account_location($username) {
global $database;
$username = strtolower($username);
$user_exists = user_exists_local($username);
if (!$user_exists && !LDAP_ENABLED) {
return false;
$user_exists_local = user_exists_local($username);
if (!$user_exists_local && !LDAP_ENABLED) {
return "NONE";
}
if ($user_exists) {
if ($user_exists_local) {
$userinfo = $database->select('accounts', ['password'], ['username' => $username])[0];
// if password empty, it's an LDAP user
if (is_empty($userinfo['password']) && LDAP_ENABLED) {
return "LDAP";
} else if (is_empty($userinfo['password']) && !LDAP_ENABLED) {
return "NONE";
} else {
if (!is_empty($userinfo['password'])) {
return "LOCAL";
} else if (is_empty($userinfo['password']) && LDAP_ENABLED) {
return "LDAP";
} else {
return "NONE";
}
} else {
if (user_exists_ldap($username)) {
@ -161,7 +161,7 @@ function authenticate_user($username, $password, &$errormsg = null, &$errorcode
global $ldap;
$username = strtolower($username);
if (is_empty($username) || is_empty($password)) {
return false;
return "NONE";
}
$loc = account_location($username, $password);
switch ($loc) {
@ -200,7 +200,7 @@ function user_exists($username) {
function user_exists_local($username) {
global $database;
$username = strtolower($username);
return $database->has('accounts', ['username' => $username, "LIMIT" => QUERY_LIMIT]);
return $database->has('accounts', ['username' => $username]) === TRUE;
}
/**