maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

show correct error-message when loginname has too many characters, fixes #811

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-02 10:57:12 +01:00
parent de05bdc968
commit 96bcb34d81
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/functions/validate/function.validateUsername.php
View File

@@ -24,24 +24,17 @@
* @return bool Correct or not
* @author Michael Duergner <michael@duergner.com>
*
* @changes Backported regex from SysCP 1.3 (lib/classes/Syscp/Handler/Validation.class.php)
*/
function validateUsername($username, $unix_names = 1, $mysql_max = '')
{
if($unix_names == 0)
{
if(strpos($username, '--') === false)
{
function validateUsername($username, $unix_names = 1, $mysql_max = '') {
if ($unix_names == 0) {
if (strpos($username, '--') === false) {
return (preg_match('/^[a-z][a-z0-9\-_]{1,' . (int)($mysql_max - 1) . '}[a-z0-9]{1}$/Di', $username) != false);
}
else
{
} else {
return false;
}
}
else
{
return (preg_match('/^[a-z][a-z0-9]{1,' . $mysql_max . '}$/Di', $username) != false);
} else {
return (preg_match('/^[a-z][a-z0-9]{1,' . (int)$mysql_max . '}$/Di', $username) != false);
}
}