Commit c5014b07 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Remove superfluous function valid_user()



This helper function was almost 100% identical to uid_from_username().
Switch to using uid_from_username(), which has a much better name and
implementation, everywhere.

Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent 396e50bd
......@@ -24,7 +24,7 @@ if (has_credential(CRED_TU_ADD_VOTE)) {
$error = "";
if (!empty($_POST['user'])) {
if (!valid_user($_POST['user'])) {
if (!uid_from_username($_POST['user'])) {
$error.= __("Username does not exist.");
} else {
......
......@@ -479,7 +479,7 @@ function try_login() {
}
$dbh = DB::connect();
$userID = valid_user($_REQUEST['user']);
$userID = uid_from_username($_REQUEST['user']);
if (user_suspended($userID)) {
$login_error = __('Account suspended');
......@@ -608,31 +608,6 @@ function valid_username($user) {
return true;
}
/**
* Determine if a username exists in the database
*
* @param string $user Username to check in the database
*
* @return string|void Return user ID if in database, otherwise void
*/
function valid_user($user) {
if (!$user) {
return false;
}
$dbh = DB::connect();
$q = "SELECT ID FROM Users WHERE ";
$q.= "Username = " . $dbh->quote($user);
$result = $dbh->query($q);
if (!$result) {
return null;
}
$row = $result->fetch(PDO::FETCH_NUM);
return $row[0];
}
/**
* Determine if a user already has a proposal open about themselves
*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment