diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php
index 07fa1315f062960e5f214aefdaa3eebb19f8837b..b8a351b170478775ece12ec358d7a6ea50c2c4cd 100644
--- a/interface/web/sites/database_user_edit.php
+++ b/interface/web/sites/database_user_edit.php
@@ -145,6 +145,8 @@ class page_action extends tform_actions {
$app->uses('getconf,tools_sites');
$global_config = $app->getconf->get_global_config('sites');
$dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $this->dataRecord);
+ $db_type = $app->db->getDatabaseType();
+ $db_version = $app->db->getDatabaseVersion();
$this->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM web_database_user WHERE database_user_id = ?", $this->id);
@@ -154,7 +156,15 @@ class page_action extends tform_actions {
//* Database username shall not be empty
if($this->dataRecord['database_user'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_user_error_empty"].'
';
- if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}', htmlentities($dbuser_prefix . $this->dataRecord['database_user'], ENT_QUOTES, 'UTF-8'), $app->tform->wordbook["database_user_error_len"]).'
';
+ //* Default username max length: 16 chars
+ $username_max_length = 16;
+
+ //* Determine username max length based on Database server type and version
+ if (($db_type === 'mariadb' && version_compare($db_version, '10.0.0', '>=')) || ($db_type === 'mysql' && version_compare($db_version, '5.7.8', '>='))) {
+ $username_max_length = 32;
+ }
+
+ if (strlen($dbuser_prefix . $this->dataRecord['database_user']) > $username_max_length) $app->tform->errorMessage .= str_replace('{user}', array(htmlentities($dbuser_prefix . $this->dataRecord['database_user'], ENT_QUOTES, 'UTF-8'), $username_max_length), $app->tform->wordbook["database_user_error_len"]) . '
';
//* Check database user against blacklist
$dbuser_blacklist = array($conf['db_user'], 'mysql', 'root');
@@ -164,8 +174,8 @@ class page_action extends tform_actions {
if ($app->tform->errorMessage == ''){
/* restrict the names if there is no error */
- /* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */
- $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
+ /* crop user and db names if they are too long -> mysql: user: 16 or 32 chars / db: 64 chars */
+ $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, $username_max_length);
}
/* prepare password for MongoDB */
@@ -192,10 +202,20 @@ class page_action extends tform_actions {
$app->uses('getconf,tools_sites');
$global_config = $app->getconf->get_global_config('sites');
$dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $this->dataRecord);
+ $db_type = $app->db->getDatabaseType();
+ $db_version = $app->db->getDatabaseVersion();
$this->dataRecord['database_user_prefix'] = $dbuser_prefix;
- if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}', htmlentities($dbuser_prefix . $this->dataRecord['database_user'], ENT_QUOTES, 'UTF-8'), $app->tform->wordbook["database_user_error_len"]).'
';
+ //* Default username max length: 16 chars
+ $username_max_length = 16;
+
+ //* Determine username max length based on Database server type and version
+ if (($db_type === 'mariadb' && version_compare($db_version, '10.0.0', '>=')) || ($db_type === 'mysql' && version_compare($db_version, '5.7.8', '>='))) {
+ $username_max_length = 32;
+ }
+
+ if (strlen($dbuser_prefix . $this->dataRecord['database_user']) > $username_max_length) $app->tform->errorMessage .= str_replace('{user}', array(htmlentities($dbuser_prefix . $this->dataRecord['database_user'], ENT_QUOTES, 'UTF-8'), $username_max_length), $app->tform->wordbook["database_user_error_len"]) . '
';
//* Check database user against blacklist
$dbuser_blacklist = array($conf['db_user'], 'mysql', 'root');
@@ -204,9 +224,9 @@ class page_action extends tform_actions {
}
/* restrict the names */
- /* crop user names if they are too long -> mysql: user: 16 chars / db: 64 chars */
- if ($app->tform->errorMessage == ''){
- $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
+ /* crop user names if they are too long -> mysql: user: 16 or 32 chars / db: 64 chars */
+ if ($app->tform->errorMessage == '') {
+ $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, $username_max_length);
}
$this->dataRecord['server_id'] = 0; // we need this on all servers
diff --git a/interface/web/sites/lib/lang/ar_database.lng b/interface/web/sites/lib/lang/ar_database.lng
index f081f1dce8802b654dee732b91d31f32a860f249..bc0ea5d17c1be929b1ffa49df0216040a567825b 100644
--- a/interface/web/sites/lib/lang/ar_database.lng
+++ b/interface/web/sites/lib/lang/ar_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'The max. number of databases is reached.';
$wb['database_name_change_txt'] = 'The database name can not be changed';
$wb['database_charset_change_txt'] = 'The database charset can not be changed';
$wb['database_name_error_len'] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.';
-$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/ar_database_user.lng b/interface/web/sites/lib/lang/ar_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/ar_database_user.lng
+++ b/interface/web/sites/lib/lang/ar_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/bg_database.lng b/interface/web/sites/lib/lang/bg_database.lng
index 675bbdd8c9aa01a3e339bc75da61208ddb0549e5..157e0d3bc2f114b1765ce1eaba83ec64e6d748f4 100644
--- a/interface/web/sites/lib/lang/bg_database.lng
+++ b/interface/web/sites/lib/lang/bg_database.lng
@@ -21,7 +21,7 @@ $wb['database_charset_change_txt'] = 'Charset на базата данни не
$wb['remote_ips_txt'] = 'Дистанционнен достъп IPs (разделени с , и празно за всички)';
$wb['database_remote_error_ips'] = 'At least one of the entered ip addresses is invalid.';
$wb['database_name_error_len'] = 'Името на базата данни - {db} - е твърде дълго. Максималната дължина трябва да бъде 64 символа включително и префикса';
-$wb['database_user_error_len'] = 'Потребителско име на базата данни- {user}- е твърде дълго. Максималната дължина трябва да е 16 символа включително префикса.';
+$wb['database_user_error_len'] = 'Потребителско име на базата данни- {user}- е твърде дълго. Максималната дължина трябва да е {max_len} символа включително префикса.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/bg_database_user.lng b/interface/web/sites/lib/lang/bg_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/bg_database_user.lng
+++ b/interface/web/sites/lib/lang/bg_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng
index 7e872a31bb771778d9373f6d85364ac17baa05c1..80d4b68fbee13b7fa20764a28f75efefc0fb4d27 100644
--- a/interface/web/sites/lib/lang/br_database.lng
+++ b/interface/web/sites/lib/lang/br_database.lng
@@ -27,7 +27,7 @@ $wb['database_name_change_txt'] = 'O nome do Banco de Dados não pode ser modifi
$wb['database_user_missing_txt'] = 'Por favor, selecione um usuário para este banco de dados.';
$wb['database_charset_change_txt'] = 'O charset do Banco de Dados não pode ser modificado.';
$wb['database_name_error_len'] = 'Nome do Banco de Dados - {db} - muito longo. O comprimento do nome do Banco de Dados, incluindo o prefixo, são 64 caracteres.';
-$wb['database_user_error_len'] = 'Nome do usuário do Banco de Dados - {user} - muito longo. O comprimento do nome do usuário, incluindo o prefixo, são 16 caracteres.';
+$wb['database_user_error_len'] = 'Nome do usuário do Banco de Dados - {user} - muito longo. O comprimento do nome do usuário, incluindo o prefixo, são {max_len} caracteres.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Selecione o site ao qual o banco de dados pertence.';
$wb['select_site_txt'] = '-Selecionar Site-';
diff --git a/interface/web/sites/lib/lang/br_database_user.lng b/interface/web/sites/lib/lang/br_database_user.lng
index 6791f16cf0f7e3f0d544fadf42ad782808b3532b..476e9e419f3bc839aa4ebd758cc71d618c80a0cd 100644
--- a/interface/web/sites/lib/lang/br_database_user.lng
+++ b/interface/web/sites/lib/lang/br_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Ativo';
$wb['database_user_error_empty'] = 'Usuário do Banco de Dados está vazio.';
$wb['database_user_error_unique'] = 'Já existe este usuário no servidor. Para ter um nome exclusivo insira, por exemplo, um prefixo como o domínio antes do nome.';
$wb['database_user_error_regex'] = 'Nome do usuário do Banco de Dados inválido. O nome do usuário deve conter apenas os caracteres: a-z, A-Z, 0-9 e underscore. Comprimento: 2 - 64 caracteres.';
-$wb['database_user_error_len'] = 'Nome do usuário do Banco de Dados - {user} - muito longo. Comprimento permitido, incluindo o prefixo, não pode ultrapassar 16 caracteres.';
+$wb['database_user_error_len'] = 'Nome do usuário do Banco de Dados - {user} - muito longo. Comprimento permitido, incluindo o prefixo, não pode ultrapassar {max_len} caracteres.';
$wb['btn_save_txt'] = 'Salvar';
$wb['btn_cancel_txt'] = 'Cancelar';
$wb['generate_password_txt'] = 'Gerar Senha';
diff --git a/interface/web/sites/lib/lang/ca_database.lng b/interface/web/sites/lib/lang/ca_database.lng
index 5a49db5f7500e33d5c11e22c73993a610b93e057..118ad09ec115a2f1c3543a82de77eaf7d9a90555 100644
--- a/interface/web/sites/lib/lang/ca_database.lng
+++ b/interface/web/sites/lib/lang/ca_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'Le nombre maximum de bases de données a été atte
$wb['database_name_change_txt'] = 'Le nom de la base ne peut être modifié';
$wb['database_charset_change_txt'] = 'Le charset de la base ne peut être modifié';
$wb['database_name_error_len'] = 'Nom de base de données - {db} - trop long. La longueur maximale incluant le préfixe est de 64 caractères.';
-$wb['database_user_error_len'] = 'Nom d\'utilisateur de base de données - {user}- trop long. La longueur maximale incluant le préfixe est de 16 caractères.';
+$wb['database_user_error_len'] = 'Nom d\'utilisateur de base de données - {user}- trop long. La longueur maximale incluant le préfixe est de {max_len} caractères.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Choisir un site -';
diff --git a/interface/web/sites/lib/lang/ca_database_user.lng b/interface/web/sites/lib/lang/ca_database_user.lng
index 2b19491e9633c91b1aaa0b3fa946fa87dc8959cb..9803d5f79491b97f4e0bfe546929c109ca31bd17 100644
--- a/interface/web/sites/lib/lang/ca_database_user.lng
+++ b/interface/web/sites/lib/lang/ca_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Utilisateur de base de données non rensigné.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Sauvegarder';
$wb['btn_cancel_txt'] = 'Annuler';
$wb['generate_password_txt'] = 'Générer mot de passe';
diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng
index 419fe424884d398e514df43edf62a5d2a18236df..6f9734b2364fd5685bfb75cbbc03febf54996847 100644
--- a/interface/web/sites/lib/lang/cz_database.lng
+++ b/interface/web/sites/lib/lang/cz_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'Byl dosažen maximální počet databází.';
$wb['database_name_change_txt'] = 'Jméno databáze nemůže být změněno';
$wb['database_charset_change_txt'] = 'Znaková sada databáze nemůže být změněna';
$wb['database_name_error_len'] = 'Název databáze - {db} - je příliš dlouhý. Maximální délka včetně prefixu je 64 znaků.';
-$wb['database_user_error_len'] = 'Jméno uživatele - {user}- je příliš dlouhé. Maximální délka včetně prefixu je 16 znaků.';
+$wb['database_user_error_len'] = 'Jméno uživatele - {user}- je příliš dlouhé. Maximální délka včetně prefixu je {max_len} znaků.';
$wb['parent_domain_id_txt'] = 'Přiřadit k webové doméně';
$wb['database_site_error_empty'] = 'Přiřaďte databázi k webové doméně.';
$wb['select_site_txt'] = '- Vybrat web doménu -';
diff --git a/interface/web/sites/lib/lang/cz_database_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng
index 629ed4607cd86a61a00c58316ed6c2db7c4f521e..e9397f71283e71198f8e1be711cf813984c58388 100644
--- a/interface/web/sites/lib/lang/cz_database_user.lng
+++ b/interface/web/sites/lib/lang/cz_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Aktivní';
$wb['database_user_error_empty'] = 'Uživatel databáze je prázdný.';
$wb['database_user_error_unique'] = 'Uživatel databáze s tímto názvem již existuje na serveru. Musíte zadat jedinečný název, např. můžete předřadit své doménové jméno k uživatelskému jménu.';
$wb['database_user_error_regex'] = 'Neplatné uživatelské jméno databáze. Uživatelské jméno může obsahovat tyto znaky: az, AZ, 0-9 a podtržítko. Délka: 2 až 64 znaků.';
-$wb['database_user_error_len'] = 'Jméno uživatele databáze - {user} - je příliš dlouhé. Max. délka jména uživatele databáze vč. prefixu může být 16 znaků.';
+$wb['database_user_error_len'] = 'Jméno uživatele databáze - {user} - je příliš dlouhé. Max. délka jména uživatele databáze vč. prefixu může být {max_len} znaků.';
$wb['btn_save_txt'] = 'Uložit';
$wb['btn_cancel_txt'] = 'Zrušit';
$wb['generate_password_txt'] = 'Generovat heslo';
diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng
index 9f7a102ca3113af670c18d287d8da92b29d60096..d7350f82f42460bc23bb8766e92d2470933cf0f6 100644
--- a/interface/web/sites/lib/lang/de_database.lng
+++ b/interface/web/sites/lib/lang/de_database.lng
@@ -27,7 +27,7 @@ $wb['database_user_missing_txt'] = 'Bitte wählen Sie einen Datenbank-Bennutzer
$wb['database_charset_change_txt'] = 'Der Zeichensatz der Datenbank kann nicht geändert werden.';
$wb['password_strength_txt'] = 'Passwortkomplexität';
$wb['database_name_error_len'] = 'Datenbank-Name - {db} - zu lang. Die max. Datenbank-Namen-Länge inkl. Präfix ist 64 Zeichen.';
-$wb['database_user_error_len'] = 'Datenbank-Benutzername - {user} - zu lang. Die max. Datenbank-Benutzernamen-Länge inkl. Präfix ist 16 Zeichen.';
+$wb['database_user_error_len'] = 'Datenbank-Benutzername - {user} - zu lang. Die max. Datenbank-Benutzernamen-Länge inkl. Präfix ist {max_len} Zeichen.';
$wb['generate_password_txt'] = 'Passwort erzeugen';
$wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
diff --git a/interface/web/sites/lib/lang/de_database_user.lng b/interface/web/sites/lib/lang/de_database_user.lng
index 1fdd237fd8f487d7e67ccf6e8b00eca727d8bfb5..b51103d1ea91808a1a5de230d9093052281e7506 100644
--- a/interface/web/sites/lib/lang/de_database_user.lng
+++ b/interface/web/sites/lib/lang/de_database_user.lng
@@ -7,7 +7,7 @@ $wb['database_user_error_empty'] = 'Datenbank-Benutzer ist leer.';
$wb['database_user_error_unique'] = 'Es existiert bereits ein Benutzer mit diesem Namen am Server. Um einen eindeutigen Namen zu erhalten können sie z.B. den Domainnamen vor dem Benutzernamen verwenden.';
$wb['database_user_error_regex'] = 'Ungültiger Benutzername. Der Benutzername darf die Zeichen: a-z, A-Z, 0-9 und den Unterstrich beinhalten. Länge: 2 - 64 Zeichen.';
$wb['password_strength_txt'] = 'Passwortkomplexität';
-$wb['database_user_error_len'] = 'Datenbank-Benutzername - {user} - zu lang. Die max. Datenbank-Benutzernamen-Länge inkl. Präfix ist 16 Zeichen.';
+$wb['database_user_error_len'] = 'Datenbank-Benutzername - {user} - zu lang. Die max. Datenbank-Benutzernamen-Länge inkl. Präfix ist {max_len} Zeichen.';
$wb['generate_password_txt'] = 'Passwort erzeugen';
$wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
diff --git a/interface/web/sites/lib/lang/dk_database.lng b/interface/web/sites/lib/lang/dk_database.lng
index 70ac3b45dd540be592c49c0b9f8499f3f3293b5e..328baf41dda609499a91a7f2bd81cdf9bb583cbe 100644
--- a/interface/web/sites/lib/lang/dk_database.lng
+++ b/interface/web/sites/lib/lang/dk_database.lng
@@ -27,7 +27,7 @@ $wb['database_name_change_txt'] = 'The database name can not be changed';
$wb['database_user_missing_txt'] = 'Vælg en database bruger for denne database.';
$wb['database_charset_change_txt'] = 'The database charset can not be changed';
$wb['database_name_error_len'] = 'Database navn - {db} - too long. Max. database name length incl. prefix is 64 chars.';
-$wb['database_user_error_len'] = 'Database brugername - {user} - too long. Max. database brugername length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database brugername - {user} - too long. Max. database brugername length incl. prefix is {max_len} chars.';
$wb['parent_domain_id_txt'] = 'Side';
$wb['database_site_error_empty'] = 'Vælg the site til which the database belongs.';
$wb['select_site_txt'] = '- Vælg Side -';
diff --git a/interface/web/sites/lib/lang/dk_database_user.lng b/interface/web/sites/lib/lang/dk_database_user.lng
index c915824e9074b756b7831558ca37c7f98ce0f4de..f89848a435797ce9425c9fad6c72b2b011a9efd5 100644
--- a/interface/web/sites/lib/lang/dk_database_user.lng
+++ b/interface/web/sites/lib/lang/dk_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Aktiv';
$wb['database_user_error_empty'] = 'Database bruger er tom.';
$wb['database_user_error_unique'] = 'There is already a database bruger with this name on the server. To get a unique name, e.g. prepend your domain name til the brugername.';
$wb['database_user_error_regex'] = 'Ugyldigt database bruger name. Brugernavne may contain these characters: a-z, A-Z, 0-9 og the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database brugername - {user} - too long. Max. database brugername length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database brugername - {user} - too long. Max. database brugername length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Gem';
$wb['btn_cancel_txt'] = 'Annullere';
$wb['generate_password_txt'] = 'Generer Adgangskode';
diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng
index d3c1555a7c6ce30dd81c51cc04f589fe3963ff71..2b47ea9e0eddcd246abc01efe684190c02cef5e1 100644
--- a/interface/web/sites/lib/lang/el_database.lng
+++ b/interface/web/sites/lib/lang/el_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'Έχετε φτάσει το μέγιστο πλή
$wb['database_name_change_txt'] = 'Το όνομα της βάσης δεδομένων δεν μπορεί να αλλαχθεί';
$wb['database_charset_change_txt'] = 'Η κωδικοποίηση χαρακτήρων δεν μπορεί να αλλάξει';
$wb['database_name_error_len'] = 'Το όνομα της βάσης δεδομένων - {db} - είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 64 χαρακτήρες.';
-$wb['database_user_error_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 16 χαρακτήρες.';
+$wb['database_user_error_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους {max_len} χαρακτήρες.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/el_database_user.lng b/interface/web/sites/lib/lang/el_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/el_database_user.lng
+++ b/interface/web/sites/lib/lang/el_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/en_database.lng b/interface/web/sites/lib/lang/en_database.lng
index 4c3e65387398062c9ec75433cd52302c20b402b2..ff90bc59f8774556173139d06e55f9d130824487 100644
--- a/interface/web/sites/lib/lang/en_database.lng
+++ b/interface/web/sites/lib/lang/en_database.lng
@@ -27,7 +27,7 @@ $wb['database_name_change_txt'] = 'The database name can not be changed';
$wb['database_user_missing_txt'] = 'Please select a database user for this database.';
$wb['database_charset_change_txt'] = 'The database charset can not be changed';
$wb['database_name_error_len'] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/en_database_user.lng b/interface/web/sites/lib/lang/en_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/en_database_user.lng
+++ b/interface/web/sites/lib/lang/en_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/es_database.lng b/interface/web/sites/lib/lang/es_database.lng
index 512d297da0fc47b887629a3d4442711227703ae5..fc3f8d022c6f7b8e0aad75598f139c3f8801aeff 100644
--- a/interface/web/sites/lib/lang/es_database.lng
+++ b/interface/web/sites/lib/lang/es_database.lng
@@ -17,7 +17,7 @@ $wb['database_remote_error_ips'] = 'Al menos una de las direcciones ip ingresada
$wb['database_ro_user_txt'] = 'Usuario con permisos solo de lectura';
$wb['database_site_error_empty'] = 'Seleccione el sitio al cual pertenecerá la base de datos.';
$wb['database_user_error_empty'] = 'El nombre de usuario de la base de datos está vacío.';
-$wb['database_user_error_len'] = 'El nombre de usuario de base de datos - {user} - es muy largo. El largo máx. del nombre de usuario incluyendo el prefijo es de 16 caracteres.';
+$wb['database_user_error_len'] = 'El nombre de usuario de base de datos - {user} - es muy largo. El largo máx. del nombre de usuario incluyendo el prefijo es de {max_len} caracteres.';
$wb['database_user_error_regex'] = 'Nombre de usuario de base de datos inválido. El nombre de usuario debe contener estos caracteres: a-z, A-Z, 0-9 y guión bajo. Largo: 2 - 64 caracteres.';
$wb['database_user_error_unique'] = 'Ya existe un usuario de base de datos con ese nombre en el servidor. Para obtener un nombre único, eje. agregue al inicio el nombre de dominio al nombre de usuario.';
$wb['database_user_missing_txt'] = 'Por favor selecciona un usuario de base de datos para esta base de datos.';
diff --git a/interface/web/sites/lib/lang/es_database_user.lng b/interface/web/sites/lib/lang/es_database_user.lng
index c1cd3ffa396487f0ce38d0c7d34d3668e163a2f4..c1405c7c60e4f6c52fce00fdf3bb5ffefec1b196 100644
--- a/interface/web/sites/lib/lang/es_database_user.lng
+++ b/interface/web/sites/lib/lang/es_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Habilitado';
$wb['database_user_error_empty'] = 'El usuario de la base de datos está vacío.';
$wb['database_user_error_unique'] = 'Ya existe un usuario de base de datos con ese nombre en el servidor. Para obtener un nombre único, eje. agregue el nombre de dominio al inicio del nombre de usuario.';
$wb['database_user_error_regex'] = 'Nombre de usuario de base de datos inválido. El nombre de usuario debe contener estos caracteres: a-z, A-Z, 0-9 y guión bajo. Largo: 2 - 64 caracteres.';
-$wb['database_user_error_len'] = 'El nombre de usuario de base de datos - {user} - es muy largo. El largo máx. del nombre de usuario incluyendo el prefijo es de 16 caracteres.';
+$wb['database_user_error_len'] = 'El nombre de usuario de base de datos - {user} - es muy largo. El largo máx. del nombre de usuario incluyendo el prefijo es de {max_len} caracteres.';
$wb['btn_save_txt'] = 'Guardar';
$wb['btn_cancel_txt'] = 'Cancelar';
$wb['generate_password_txt'] = 'Generar contraseña';
diff --git a/interface/web/sites/lib/lang/fi_database.lng b/interface/web/sites/lib/lang/fi_database.lng
index 397cdbf03144fca54003da1aaf292baeda666963..7996a11263d6d6400d7daf7b10691cf9606f8468 100644
--- a/interface/web/sites/lib/lang/fi_database.lng
+++ b/interface/web/sites/lib/lang/fi_database.lng
@@ -21,7 +21,7 @@ $wb['database_charset_change_txt'] = 'Tietokannan merkistöä ei voi vaihtaa';
$wb['remote_ips_txt'] = 'Etäkäytön ip-osoittteet (pilkulla erotettu lista, jätä tyhjäksi jos haluat sallia kaikki)';
$wb['database_remote_error_ips'] = 'Ainakin yksi annetuista ip-osoitteista on väärin.';
$wb['database_name_error_len'] = 'Tietokannan nimi on liian pitkä. Nimen enimmäispituus etuliite mukaanlukien on 64 merkkiä.';
-$wb['database_user_error_len'] = 'Tietokanan käyttäjän nimi on liian pitkä. Nimen enimmäispituus etuliite mukaanlukien on 16 merkkiä.';
+$wb['database_user_error_len'] = 'Tietokanan käyttäjän nimi on liian pitkä. Nimen enimmäispituus etuliite mukaanlukien on {max_len} merkkiä.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/fi_database_user.lng b/interface/web/sites/lib/lang/fi_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/fi_database_user.lng
+++ b/interface/web/sites/lib/lang/fi_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/fr_database.lng b/interface/web/sites/lib/lang/fr_database.lng
index 77e1d561cb1f3df02d7b30f4565b1f86e9b81726..685caf3e48a69ba87352d190f6cf8a081f1da05f 100644
--- a/interface/web/sites/lib/lang/fr_database.lng
+++ b/interface/web/sites/lib/lang/fr_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'Le nombre maximum de bases de données a été atte
$wb['database_name_change_txt'] = 'Le nom de la base ne peut être modifié';
$wb['database_charset_change_txt'] = 'Le charset de la base ne peut être modifié';
$wb['database_name_error_len'] = 'Nom de base de données - {db} - trop long. La longueur maximale incluant le préfixe est de 64 caractères.';
-$wb['database_user_error_len'] = 'Nom d’utilisateur de base de données - {user}- trop long. La longueur maximale incluant le préfixe est de 16 caractères.';
+$wb['database_user_error_len'] = 'Nom d’utilisateur de base de données - {user}- trop long. La longueur maximale incluant le préfixe est de {max_len} caractères.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Sélectionnez le site -';
diff --git a/interface/web/sites/lib/lang/fr_database_user.lng b/interface/web/sites/lib/lang/fr_database_user.lng
index af4011904d062d9ab9ceadea71ab9668c7746baf..1c2dc60fb4e9236442f8760a4b857bdebf11b125 100644
--- a/interface/web/sites/lib/lang/fr_database_user.lng
+++ b/interface/web/sites/lib/lang/fr_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Générer un mot de passe';
diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng
index f1c7d0db2e14301107af5f8c302b16615b0cba48..911a29e0f617ca21dcfbd998d777e53c1b00544a 100644
--- a/interface/web/sites/lib/lang/hr_database.lng
+++ b/interface/web/sites/lib/lang/hr_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'Iskoristili ste maksimalan broj baza.';
$wb['database_name_change_txt'] = 'Naziv baze ne može biti promijenjen';
$wb['database_charset_change_txt'] = 'Skup znakova baze ne može biti promijenjen';
$wb['database_name_error_len'] = 'Naziv baze - {db} - je predugačak. Maksimalna duljina naziva baze uključujući prefix je 64 znakova.';
-$wb['database_user_error_len'] = 'Naziv korisnika baze - {user}- je predugačak. Maksimalna duljina naziva korisnika baze uključujući prefix je 16 znakova.';
+$wb['database_user_error_len'] = 'Naziv korisnika baze - {user}- je predugačak. Maksimalna duljina naziva korisnika baze uključujući prefix je {max_len} znakova.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/hr_database_user.lng b/interface/web/sites/lib/lang/hr_database_user.lng
index 825d685a09e129ad53124643f680cdda18345406..480b37f4910dbfeeae934af81f4d8903dc13411e 100644
--- a/interface/web/sites/lib/lang/hr_database_user.lng
+++ b/interface/web/sites/lib/lang/hr_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Aktivno';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, npr. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Spremi';
$wb['btn_cancel_txt'] = 'Odustani';
$wb['generate_password_txt'] = 'Generiraj šifru';
diff --git a/interface/web/sites/lib/lang/hu_database.lng b/interface/web/sites/lib/lang/hu_database.lng
index cb27357b9736f6ffc9dc027d0cd9ecb61148b655..6496bc1fe635ea0a1393a79bf93c35431d403873 100644
--- a/interface/web/sites/lib/lang/hu_database.lng
+++ b/interface/web/sites/lib/lang/hu_database.lng
@@ -21,7 +21,7 @@ $wb['password_strength_txt'] = 'Jelszó erősségee';
$wb['remote_ips_txt'] = 'Távoli elérés IP címei (vesszővel elválasztva, ha üresen hagyja akkor bárhonnan elérhető)';
$wb['database_remote_error_ips'] = 'Legalább egy megadott IP cím hibás.';
$wb['database_name_error_len'] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.';
-$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/hu_database_user.lng b/interface/web/sites/lib/lang/hu_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/hu_database_user.lng
+++ b/interface/web/sites/lib/lang/hu_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/id_database.lng b/interface/web/sites/lib/lang/id_database.lng
index 90d38332179d6b6d3079dea3b232871f40cdd6f6..b1f829b8d11dd56a443bf59dfda0fd0c77a605fc 100644
--- a/interface/web/sites/lib/lang/id_database.lng
+++ b/interface/web/sites/lib/lang/id_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'Jumlah maks databases telah tercapai.';
$wb['database_name_change_txt'] = 'Nama database tidak dapat diubah';
$wb['database_charset_change_txt'] = 'Database charset tidak dapat diubah';
$wb['database_name_error_len'] = 'Nama database - {db} - terlalu panjang. Panjang nama database maks termasuk prefiks adalah 64 karakter.';
-$wb['database_user_error_len'] = 'Nama pengguna database - {user}- terlalu panjang. Panjang nama pengguna database maks termasuk prefiks adalah 16 karakter.';
+$wb['database_user_error_len'] = 'Nama pengguna database - {user}- terlalu panjang. Panjang nama pengguna database maks termasuk prefiks adalah {max_len} karakter.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/id_database_user.lng b/interface/web/sites/lib/lang/id_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/id_database_user.lng
+++ b/interface/web/sites/lib/lang/id_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/it_database.lng b/interface/web/sites/lib/lang/it_database.lng
index 007daaa00235c329cb627d15acb61dfb60e8a7ce..0ddf0ee8280c7da24e81bf4c093391694af064ae 100644
--- a/interface/web/sites/lib/lang/it_database.lng
+++ b/interface/web/sites/lib/lang/it_database.lng
@@ -21,7 +21,7 @@ $wb['database_charset_change_txt'] = 'Il charset per il database non può essere
$wb['remote_ips_txt'] = 'Accesso IP remoti(separa con , e lascia campo vuoto per qualunque)';
$wb['database_remote_error_ips'] = 'Almeno uno degli indirizzi IP inseriti non è valido.';
$wb['database_name_error_len'] = 'Nome Database - {db} - troppo lungo. La lunghezza massima compreso il prefisso è di 64 caratteri.';
-$wb['database_user_error_len'] = 'Nome utente Database - {user}- troppo lungo. La lunghezza massima compreso il prefisso è di 16 caratteri.';
+$wb['database_user_error_len'] = 'Nome utente Database - {user}- troppo lungo. La lunghezza massima compreso il prefisso è di {max_len} caratteri.';
$wb['parent_domain_id_txt'] = 'Sito';
$wb['database_site_error_empty'] = 'Seleziona a chi appartiene il database.';
$wb['select_site_txt'] = '- Seleziona Sito -';
diff --git a/interface/web/sites/lib/lang/it_database_user.lng b/interface/web/sites/lib/lang/it_database_user.lng
index c0cb43b9d5bcdaa6a674413fa090785984d11cc1..4ed37a48e4d18a08490671b1d16c01299481b745 100644
--- a/interface/web/sites/lib/lang/it_database_user.lng
+++ b/interface/web/sites/lib/lang/it_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Attivo';
$wb['database_user_error_empty'] = 'Utente Database vuoto.';
$wb['database_user_error_unique'] = 'Nome utente database già presente su questo server. Per ottener un nome univoco ad esempio preponi il tuo dominio al nome utente.';
$wb['database_user_error_regex'] = 'Nome utente database non valido.IL nome utente può contenere i seguenti caratteri: a-z, A-Z, 0-9 and the underscore. lunghezza: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Nome Utente Database - {user} - troppo lungo. Lunghezza massima per nome utente di database incluso prefissso: 16 caratteri.';
+$wb['database_user_error_len'] = 'Nome Utente Database - {user} - troppo lungo. Lunghezza massima per nome utente di database incluso prefissso: {max_len} caratteri.';
$wb['btn_save_txt'] = 'Salva';
$wb['btn_cancel_txt'] = 'Annulla';
$wb['generate_password_txt'] = 'Genera Password';
diff --git a/interface/web/sites/lib/lang/ja_database.lng b/interface/web/sites/lib/lang/ja_database.lng
index f081f1dce8802b654dee732b91d31f32a860f249..bc0ea5d17c1be929b1ffa49df0216040a567825b 100644
--- a/interface/web/sites/lib/lang/ja_database.lng
+++ b/interface/web/sites/lib/lang/ja_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'The max. number of databases is reached.';
$wb['database_name_change_txt'] = 'The database name can not be changed';
$wb['database_charset_change_txt'] = 'The database charset can not be changed';
$wb['database_name_error_len'] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.';
-$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/ja_database_user.lng b/interface/web/sites/lib/lang/ja_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/ja_database_user.lng
+++ b/interface/web/sites/lib/lang/ja_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng
index d9bbfb0693f46f5abf9ac680f37febffb629d3c9..3645a656a716d7ee1e174b291c1f40f7f251f247 100644
--- a/interface/web/sites/lib/lang/nl_database.lng
+++ b/interface/web/sites/lib/lang/nl_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'Het max. aantal databases is bereikt.';
$wb['database_name_change_txt'] = 'De databasenaam kan niet worden gewijzigd';
$wb['database_charset_change_txt'] = 'De database karakterset kan niet worden gewijzigd';
$wb['database_name_error_len'] = 'Databasenaam - {db} - is te lang. De max. lengte van de databasenaam incl. voorvoegsel is 64 karakters.';
-$wb['database_user_error_len'] = 'Databasenaam - {user}- is te lang. De max. lengte van de database gebruikersnaam incl. voorvoegsel is 16 karakters.';
+$wb['database_user_error_len'] = 'Databasenaam - {user}- is te lang. De max. lengte van de database gebruikersnaam incl. voorvoegsel is {max_len} karakters.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Selecteer de site waar deze database aan gelinkt moet worden.';
$wb['select_site_txt'] = '- Selecteer Site -';
diff --git a/interface/web/sites/lib/lang/nl_database_user.lng b/interface/web/sites/lib/lang/nl_database_user.lng
index cec8e7ac3f878ead9869d0e2c6aa89d25300968b..3adcf301706d08e969e2953d8ae9b5354049e429 100644
--- a/interface/web/sites/lib/lang/nl_database_user.lng
+++ b/interface/web/sites/lib/lang/nl_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Actief';
$wb['database_user_error_empty'] = 'Database gebruiker is leeg.';
$wb['database_user_error_unique'] = 'Er bestaat al een database gebruiker met deze naam op deze server. Voeg bv. de domeinnaam toe aan de gebruikersnaam om een unieke combinatie te krijgen.';
$wb['database_user_error_regex'] = 'Database gebruiker is niet correct. De gebruikersnaam mag de volgende karakters bevatten: a-z. A-Z. 0-9 en evt. een underscore. De lengte mag tussen de 2 en 64 karakters bedragen.';
-$wb['database_user_error_len'] = 'Database gebruikernaam - {user} - is te lang. De max. database gebruikernaam lengte incl. prefix is 16 karakters.';
+$wb['database_user_error_len'] = 'Database gebruikernaam - {user} - is te lang. De max. database gebruikernaam lengte incl. prefix is {max_len} karakters.';
$wb['btn_save_txt'] = 'Opslaan';
$wb['btn_cancel_txt'] = 'Annuleren';
$wb['generate_password_txt'] = 'Genereer wachtwoord';
diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng
index 57294f0a4050ab754379c710b092268458944350..845ea1d255988125a68d4f8cdea1979fbd6be983 100644
--- a/interface/web/sites/lib/lang/pl_database.lng
+++ b/interface/web/sites/lib/lang/pl_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'Maksymalna liczba baz danych została przekroczona.
$wb['database_name_change_txt'] = 'Nie można zmienić nazwy bazy danych.';
$wb['database_charset_change_txt'] = 'Nie można zmienić kodowania bazy danych.';
$wb['database_name_error_len'] = 'Nazwa bazy danych - {db} - za długa. Maksymalna długość wynosi 64 znaki łącznie z prefiksem.';
-$wb['database_user_error_len'] = 'Nazwa użytkownika bazy - {user}- za długa. Maksymalna długość wynosi 16 znaków łącznie z prefiksem.';
+$wb['database_user_error_len'] = 'Nazwa użytkownika bazy - {user}- za długa. Maksymalna długość wynosi {max_len} znaków łącznie z prefiksem.';
$wb['database_ro_user_txt'] = 'Użytkownik tylko do odczytu';
$wb['optional_txt'] = 'opcjonalnie';
$wb['select_dbuser_txt'] = 'Wybierz nazwę użytkownika bazy';
diff --git a/interface/web/sites/lib/lang/pl_database_user.lng b/interface/web/sites/lib/lang/pl_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/pl_database_user.lng
+++ b/interface/web/sites/lib/lang/pl_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/pt_database.lng b/interface/web/sites/lib/lang/pt_database.lng
index 9da316d039ca4c8f6a4d827afb0e936f3ecf9d5d..4b78fd70b1d59420e4d9468cb8aba4bcbb5ef16c 100644
--- a/interface/web/sites/lib/lang/pt_database.lng
+++ b/interface/web/sites/lib/lang/pt_database.lng
@@ -21,7 +21,7 @@ $wb['database_charset_change_txt'] = 'O charset da base de dados não pode ser m
$wb['remote_ips_txt'] = 'Endereços IP Remotos (separados por , deixe em branco para quaisquer ips)';
$wb['database_remote_error_ips'] = 'Pelo menos um dos endereços ip informados não é válido.';
$wb['database_name_error_len'] = 'O nome da base de dados - {db} - é muito longo. 64 caracteres é o número máximo permitido incluindo prefixo.';
-$wb['database_user_error_len'] = 'O nome de utilizador da base de dados - {user}- é muito longo. 16 caracteres é o número máximo permitido incluindo prefixo.';
+$wb['database_user_error_len'] = 'O nome de utilizador da base de dados - {user}- é muito longo. {max_len} caracteres é o número máximo permitido incluindo prefixo.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/pt_database_user.lng b/interface/web/sites/lib/lang/pt_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/pt_database_user.lng
+++ b/interface/web/sites/lib/lang/pt_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/ro_database.lng b/interface/web/sites/lib/lang/ro_database.lng
index 73f2b3eb6347a99d22f0c0f2c3642a39924e428c..afb8871831575e1d1dea678beb5074bccc313bd8 100644
--- a/interface/web/sites/lib/lang/ro_database.lng
+++ b/interface/web/sites/lib/lang/ro_database.lng
@@ -21,7 +21,7 @@ $wb['database_charset_change_txt'] = 'The database charset can not be changed';
$wb['remote_ips_txt'] = 'Remote Access IPs (separate by , and leave blank for any)';
$wb['database_remote_error_ips'] = 'At least one of the entered ip addresses is invalid.';
$wb['database_name_error_len'] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.';
-$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/ro_database_user.lng b/interface/web/sites/lib/lang/ro_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/ro_database_user.lng
+++ b/interface/web/sites/lib/lang/ro_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/ru_database.lng b/interface/web/sites/lib/lang/ru_database.lng
index 478be40597d40c8de3b48c2bb9e1d7d41176894b..dbbb75310ef0434632186ae3f02eb0827b78c1f5 100644
--- a/interface/web/sites/lib/lang/ru_database.lng
+++ b/interface/web/sites/lib/lang/ru_database.lng
@@ -21,7 +21,7 @@ $wb['password_strength_txt'] = 'Стойкость пароля';
$wb['remote_ips_txt'] = 'IP-адреса для удалённого доступа (разделяются запятой оставьте поле пустым для любого)';
$wb['database_remote_error_ips'] = 'Минимум один введенный адрес неверен.';
$wb['database_name_error_len'] = 'Имя базы данных - {db} - cлишком длинное. Максимальная длина имени базы данных включая префикс - 64 символа';
-$wb['database_user_error_len'] = 'Логин для базы данных - {user} - cлишком длинный. Максимальная длина логина - 16 символов';
+$wb['database_user_error_len'] = 'Логин для базы данных - {user} - cлишком длинный. Максимальная длина логина - {max_len} символов';
$wb['parent_domain_id_txt'] = 'Сайт';
$wb['database_site_error_empty'] = 'Выберите сайт, к которому принадлежит база данных.';
$wb['select_site_txt'] = '- Выбор сайта -';
diff --git a/interface/web/sites/lib/lang/ru_database_user.lng b/interface/web/sites/lib/lang/ru_database_user.lng
index 7de99a11dc9f84088cd9203dd0bdaa331114ab13..95805a60a8b37fce668ad9774aecfcccbe73655a 100644
--- a/interface/web/sites/lib/lang/ru_database_user.lng
+++ b/interface/web/sites/lib/lang/ru_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Активно';
$wb['database_user_error_empty'] = 'Логин базы данных пустой';
$wb['database_user_error_unique'] = 'Такой пользователь базы данных уже существует. Что бы получить уникальное имя, например, сложите название сайта и ваше имя.';
$wb['database_user_error_regex'] = 'Некорректный логин для базы данных. Логин может содержать только следующие символы: a-z, A-Z, 0-9 и \\"_\\". Длина: 2 - 16 символов.';
-$wb['database_user_error_len'] = 'Логин для базы данных - {user} - cлишком длинный. Максимальная длина логина - 16 символов';
+$wb['database_user_error_len'] = 'Логин для базы данных - {user} - cлишком длинный. Максимальная длина логина - {max_len} символов';
$wb['btn_save_txt'] = 'Сохранить';
$wb['btn_cancel_txt'] = 'Отменить';
$wb['generate_password_txt'] = 'Создать пароль';
diff --git a/interface/web/sites/lib/lang/se_database.lng b/interface/web/sites/lib/lang/se_database.lng
index bf3f3fabfe8b1dbf698a0bc8fc84382a1e9847a2..b7d876df0fb4b274facfacca8cd238b9cd8e5a2d 100644
--- a/interface/web/sites/lib/lang/se_database.lng
+++ b/interface/web/sites/lib/lang/se_database.lng
@@ -21,7 +21,7 @@ $wb['database_charset_change_txt'] = 'The database charset can not be changed';
$wb['remote_ips_txt'] = 'Remote Access IPs (separate by , and leave blank for any)';
$wb['database_remote_error_ips'] = 'At least one of the entered ip addresses is invalid.';
$wb['database_name_error_len'] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.';
-$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['parent_domain_id_txt'] = 'Domän';
$wb['database_site_error_empty'] = 'Välj vilken domän databasen tillhör';
$wb['select_site_txt'] = '- Välj domän -';
diff --git a/interface/web/sites/lib/lang/se_database_user.lng b/interface/web/sites/lib/lang/se_database_user.lng
index a1d349f9a38378ee50e2422aa70676cf990c4ede..d1ca7d8b119874f8b6ba55033135fb63e6f14250 100644
--- a/interface/web/sites/lib/lang/se_database_user.lng
+++ b/interface/web/sites/lib/lang/se_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Aktiv';
$wb['database_user_error_empty'] = 'Databasanvändare är tomt';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Spara';
$wb['btn_cancel_txt'] = 'Avbryt';
$wb['generate_password_txt'] = 'Generera lösenord';
diff --git a/interface/web/sites/lib/lang/sk_database.lng b/interface/web/sites/lib/lang/sk_database.lng
index 7b8b53f2abd134510526f6e3e19288724046fffb..cc89c514e3d55250ab9e52a3f9de3da0178374da 100644
--- a/interface/web/sites/lib/lang/sk_database.lng
+++ b/interface/web/sites/lib/lang/sk_database.lng
@@ -21,7 +21,7 @@ $wb['limit_database_txt'] = 'Max. počet databáz je dosiahnutý.';
$wb['database_name_change_txt'] = 'Názov databázy nie je možné meniť';
$wb['database_charset_change_txt'] = 'Databázový charset nemožno meniť';
$wb['database_name_error_len'] = 'Názov databázy - (db) - príliš dlhý. Max. dĺžka názvu databázy vrátane prefix je 64 znakov.';
-$wb['database_user_error_len'] = 'Databázové Užívateľské meno - (user) - príliš dlho. Max. dĺžka Databázového usera vrátane prefix je 16 znakov.';
+$wb['database_user_error_len'] = 'Databázové Užívateľské meno - (user) - príliš dlho. Max. dĺžka Databázového usera vrátane prefix je {max_len} znakov.';
$wb['parent_domain_id_txt'] = 'Site';
$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
$wb['select_site_txt'] = '- Select Site -';
diff --git a/interface/web/sites/lib/lang/sk_database_user.lng b/interface/web/sites/lib/lang/sk_database_user.lng
index ab7b59f6495eed677699e39ab038c6fd6ddc9e2b..1501e6a2d48c0158e21815130d0492f466d4c1ca 100644
--- a/interface/web/sites/lib/lang/sk_database_user.lng
+++ b/interface/web/sites/lib/lang/sk_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Active';
$wb['database_user_error_empty'] = 'Database user is empty.';
$wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
$wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
+$wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is {max_len} chars.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['generate_password_txt'] = 'Generate Password';
diff --git a/interface/web/sites/lib/lang/tr_database.lng b/interface/web/sites/lib/lang/tr_database.lng
index 9f8d200e436770f599663ba2db3b1215af3fa9d0..ec6eb74af3741a6a815243bcd278622af450601d 100644
--- a/interface/web/sites/lib/lang/tr_database.lng
+++ b/interface/web/sites/lib/lang/tr_database.lng
@@ -27,7 +27,7 @@ $wb['database_name_change_txt'] = 'Veritabanı adı değiştirilemedi';
$wb['database_user_missing_txt'] = 'Lütfen bu veritabanı için bir veritabanı kullanıcısı seçin.';
$wb['database_charset_change_txt'] = 'Veritabanı karakter kümesi değiştirilemedi';
$wb['database_name_error_len'] = 'Veritabanı adı - {db} - çok uzun. Veritabanı adı ön ek dahil en fazla 64 karakter olabilir.';
-$wb['database_user_error_len'] = 'Veritabanı kullanıcı adı - {user} - çok uzun. Veritabanı kullanıcı adı ön ek dahil en fazla 16 karakter olabilir.';
+$wb['database_user_error_len'] = 'Veritabanı kullanıcı adı - {user} - çok uzun. Veritabanı kullanıcı adı ön ek dahil en fazla {max_len} karakter olabilir.';
$wb['parent_domain_id_txt'] = 'Web Sitesi';
$wb['database_site_error_empty'] = 'Veritabanının ait olduğu siteyi seçin.';
$wb['select_site_txt'] = '- Siteyi Seçin -';
diff --git a/interface/web/sites/lib/lang/tr_database_user.lng b/interface/web/sites/lib/lang/tr_database_user.lng
index 3f6ba89f49b8150cc24341cf9e479aaa4285f813..c6f4584ad7d8272f53ac25352db22e3e7d47131b 100644
--- a/interface/web/sites/lib/lang/tr_database_user.lng
+++ b/interface/web/sites/lib/lang/tr_database_user.lng
@@ -7,7 +7,7 @@ $wb['active_txt'] = 'Etkin';
$wb['database_user_error_empty'] = 'Veritabanı kullanıcısı boş olamaz.';
$wb['database_user_error_unique'] = 'Sunucuda aynı adlı bir veritabanı kullanıcısı var. Benzersiz bir ad vermek için, kullanıcı adının başına etki alanınızı ekleyebilirsiniz.';
$wb['database_user_error_regex'] = 'Veritabanı kullanıcı adı geçersiz. Veritabanı kullanıcı adı 2-64 uzunluğunda olmalı ve yalnız a-z, A-Z, 0-9 ve alt çizgi(_) karakterlerinden oluşmalıdır.';
-$wb['database_user_error_len'] = 'Veritabanı kullanıcı adı - {user} - çok uzun. Ön ek dahil en uzun veritabanı kullanıcı adı 16 karakter olmalıdır.';
+$wb['database_user_error_len'] = 'Veritabanı kullanıcı adı - {user} - çok uzun. Ön ek dahil en uzun veritabanı kullanıcı adı {max_len} karakter olmalıdır.';
$wb['btn_save_txt'] = 'Kaydet';
$wb['btn_cancel_txt'] = 'Geri';
$wb['generate_password_txt'] = 'Parola Üret';