mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
acctfuncs.inc.php: Change return type of valid_username function
The function is only determining whether a username is valid, so it makes more sense to simply return a boolean value. Signed-off-by: canyonknight <canyonknight@gmail.com> Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
parent
a61d73d804
commit
1fd620cc2f
1 changed files with 5 additions and 6 deletions
|
@ -480,12 +480,12 @@ function try_login($dbh=NULL) {
|
|||
*
|
||||
* The username must be longer or equal to USERNAME_MIN_LEN. It must be shorter
|
||||
* or equal to USERNAME_MAX_LEN. It must start and end with either a letter or
|
||||
* a number. It can contain one period, hypen, or underscore. Returns username
|
||||
* if it meets all of those rules.
|
||||
* a number. It can contain one period, hypen, or underscore. Returns boolean
|
||||
* of whether name is valid.
|
||||
*
|
||||
* @param string $user Username to validate
|
||||
*
|
||||
* @return string|void Return username if it meets criteria, otherwise void
|
||||
* @return bool True if username meets criteria, otherwise false
|
||||
*/
|
||||
function valid_username($user) {
|
||||
if (!empty($user)) {
|
||||
|
@ -500,13 +500,12 @@ function valid_username($user) {
|
|||
# contain only letters and numbers,
|
||||
# and at most has one dash, period, or underscore
|
||||
if ( preg_match("/^[a-z0-9]+[.\-_]?[a-z0-9]+$/", $user) ) {
|
||||
#All is good return the username
|
||||
return $user;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue