Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Marcus Andersson
aurweb
Commits
0722f46c
Commit
0722f46c
authored
Feb 06, 2014
by
Lukas Fleischer
Browse files
Simplify valid_user() and valid_username()
Signed-off-by:
Lukas Fleischer
<
archlinux@cryptocrack.de
>
parent
3f0a1a82
Changes
1
Hide whitespace changes
Inline
Side-by-side
web/lib/acctfuncs.inc.php
View file @
0722f46c
...
...
@@ -537,17 +537,14 @@ function is_ipbanned() {
* @return bool True if username meets criteria, otherwise false
*/
function
valid_username
(
$user
)
{
if
(
!
empty
(
$user
))
{
if
(
strlen
(
$user
)
>=
USERNAME_MIN_LEN
&&
strlen
(
$user
)
<=
USERNAME_MAX_LEN
)
{
$user
=
strtolower
(
$user
);
if
(
preg_match
(
"/^[a-z0-9]+[.\-_]?[a-z0-9]+$/"
,
$user
)
)
{
return
true
;
}
}
if
(
strlen
(
$user
)
<
USERNAME_MIN_LEN
||
strlen
(
$user
)
>
USERNAME_MAX_LEN
)
{
return
false
;
}
else
if
(
!
preg_match
(
"/^[a-z0-9]+[.\-_]?[a-z0-9]+$/"
,
$user
))
{
return
false
;
}
return
fals
e
;
return
tru
e
;
}
/**
...
...
@@ -558,21 +555,17 @@ function valid_username($user) {
* @return string|void Return user ID if in database, otherwise void
*/
function
valid_user
(
$user
)
{
/* if ( $user = valid_username($user) ) { */
$dbh
=
DB
::
connect
();
if
(
$user
)
{
$q
=
"SELECT ID FROM Users "
;
$q
.
=
"WHERE Username = "
.
$dbh
->
quote
(
$user
);
if
(
$user
)
{
$dbh
=
DB
::
connect
();
$q
=
"SELECT ID FROM Users WHERE "
;
$q
.
=
"Username = "
.
$dbh
->
quote
(
$user
);
$result
=
$dbh
->
query
(
$q
);
if
(
$result
)
{
$row
=
$result
->
fetch
(
PDO
::
FETCH_NUM
);
return
$row
[
0
];
}
}
return
;
}
/**
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment