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

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

View File

@@ -628,7 +628,7 @@ if ($page == 'customers'
&& $_POST['new_loginname'] != ''
) {
$accountnumber = intval($settings['system']['lastaccountnumber']);
$loginname = validate($_POST['new_loginname'], 'loginname', '/^[a-z0-9\-_]+$/i');
$loginname = validate($_POST['new_loginname'], 'loginname', '/^[a-z][a-z0-9\-_]+$/i');
// Accounts which match systemaccounts are not allowed, filtering them
if (preg_match('/^' . preg_quote($settings['customer']['accountprefix'], '/') . '([0-9]+)/', $loginname)) {
@@ -665,7 +665,7 @@ if ($page == 'customers'
standard_error('loginnameexists', $loginname);
} elseif (!validateUsername($loginname, $settings['panel']['unix_names'], 14 - strlen($settings['customer']['mysqlprefix']))) {
standard_error('loginnameiswrong', $loginname);
standard_error('loginnameiswrong', 14 - strlen($settings['customer']['mysqlprefix']));
}
$guid = intval($settings['system']['lastguid']) + 1;