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

update dev-environment to use more recent versions, requries php-7.3 now (dev-only)

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-06-06 10:18:03 +02:00
parent 0afbe3d13b
commit d8a8f76dc9
11 changed files with 439 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Froxlor/Api/Commands/Customers.php
View File

@@ -340,11 +340,12 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource
'login' => $loginname
), true, true);
$mysql_maxlen = \Froxlor\Database\Database::getSqlUsernameLength() - strlen(Settings::Get('customer.mysqlprefix'));
if (strtolower($loginname_check['loginname']) == strtolower($loginname) || strtolower($loginname_check_admin['loginname']) == strtolower($loginname)) {
\Froxlor\UI\Response::standard_error('loginnameexists', $loginname, true);
} elseif (! \Froxlor\Validate\Validate::validateUsername($loginname, Settings::Get('panel.unix_names'), 14 - strlen(Settings::Get('customer.mysqlprefix')))) {
if (strlen($loginname) > 14 - strlen(Settings::Get('customer.mysqlprefix'))) {
\Froxlor\UI\Response::standard_error('loginnameiswrong2', 14 - strlen(Settings::Get('customer.mysqlprefix')), true);
} elseif (! \Froxlor\Validate\Validate::validateUsername($loginname, Settings::Get('panel.unix_names'), $mysql_maxlen)) {
if (strlen($loginname) > $mysql_maxlen) {
\Froxlor\UI\Response::standard_error('loginnameiswrong2', $mysql_maxlen, true);
} else {
\Froxlor\UI\Response::standard_error('loginnameiswrong', $loginname, true);
}

2
lib/Froxlor/Database/Database.php
View File

@@ -193,7 +193,7 @@ class Database
// MySQL user names can be up to 32 characters long (16 characters before MySQL 5.7.8).
$mysql_max = 32;
if (version_compare(Database::getAttribute(\PDO::ATTR_SERVER_VERSION), '5.7.8', '<')) {
$mysql_max -= 16;
$mysql_max = 16;
}
return $mysql_max;
}

2
lib/Froxlor/Validate/Check.php
View File

@@ -192,7 +192,7 @@ class Check
}
$returnvalue = array();
if (Validate::validateUsername($newfieldvalue, Settings::Get('panel.unix_names'), 14 - strlen($allnewfieldvalues['customer_mysqlprefix'])) === true) {
if (Validate::validateUsername($newfieldvalue, Settings::Get('panel.unix_names'), \Froxlor\Database\Database::getSqlUsernameLength() - strlen($allnewfieldvalues['customer_mysqlprefix'])) === true) {
$returnvalue = array(
self::FORMFIELDS_PLAUSIBILITY_CHECK_OK
);