external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify valid_user() and valid_username()

Browse source 
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-02-06 16:06:04 +01:00
parent 3f0a1a827a
commit 0722f46c6e
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
web/lib/acctfuncs.inc.php
View file

@ -537,17 +537,14 @@ function is_ipbanned() {
* @return bool True if username meets criteria, otherwise false * @return bool True if username meets criteria, otherwise false
*/ */
function valid_username($user) { function valid_username($user) {
if (!empty($user)) { if (strlen($user) < USERNAME_MIN_LEN ||
if ( strlen($user) >= USERNAME_MIN_LEN && strlen($user) > USERNAME_MAX_LEN) {
strlen($user) <= USERNAME_MAX_LEN ) { return false;
$user = strtolower($user); } else if (!preg_match("/^[a-z0-9]+[.\-_]?[a-z0-9]+$/", $user)) {
if ( preg_match("/^[a-z0-9]+[.\-_]?[a-z0-9]+$/", $user) ) { return false;
return true;
}
}
} }
return false; return true;
} }
/** /**
@ -558,21 +555,17 @@ function valid_username($user) {
* @return string|void Return user ID if in database, otherwise void * @return string|void Return user ID if in database, otherwise void
*/ */
function valid_user($user) { function valid_user($user) {
/* if ( $user = valid_username($user) ) { */ if ($user) {
$dbh = DB::connect();
$dbh = DB::connect();
if ( $user ) {
$q = "SELECT ID FROM Users ";
$q.= "WHERE Username = " . $dbh->quote($user);
$q = "SELECT ID FROM Users WHERE ";
$q.= "Username = " . $dbh->quote($user);
$result = $dbh->query($q); $result = $dbh->query($q);
if ($result) { if ($result) {
$row = $result->fetch(PDO::FETCH_NUM); $row = $result->fetch(PDO::FETCH_NUM);
return $row[0]; return $row[0];
} }
} }
return;
} }
/** /**