Merge branch 'develop' into 'develop'

Change database username length to 32 from 16

See merge request ispconfig/ispconfig3!1925

Author: Till Brehm

interface/web/sites/database_edit.php

@@ -352,7 +352,7 @@ function onBeforeUpdate() {
 
 		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 */
+			/* crop user and db names if they are too long -> mysql: user: 32 chars / db: 64 chars */
 			$this->dataRecord['database_name'] = substr($dbname_prefix . $this->dataRecord['database_name'], 0, 64);
 		}
 

interface/web/sites/database_user_edit.php

@@ -154,7 +154,7 @@ function onBeforeUpdate() {
 		//* Database username shall not be empty
 		if($this->dataRecord['database_user'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_user_error_empty"].'<br />';
 
-		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"]).'<br />';
+		if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 32) $app->tform->errorMessage .= str_replace('{user}', htmlentities($dbuser_prefix . $this->dataRecord['database_user'], ENT_QUOTES, 'UTF-8'), $app->tform->wordbook["database_user_error_len"]).'<br />';
 
 		//* Check database user against blacklist
 		$dbuser_blacklist = array($conf['db_user'], 'mysql', 'root');
@@ -164,8 +164,8 @@ function onBeforeUpdate() {
 
 		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: 32 chars / db: 64 chars */
+			$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 32);
 		}
 
 		/* prepare password for MongoDB */
@@ -195,7 +195,7 @@ function onBeforeInsert() {
 
 		$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"]).'<br />';
+		if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 32) $app->tform->errorMessage .= str_replace('{user}', htmlentities($dbuser_prefix . $this->dataRecord['database_user'], ENT_QUOTES, 'UTF-8'), $app->tform->wordbook["database_user_error_len"]).'<br />';
 
 		//* Check database user against blacklist
 		$dbuser_blacklist = array($conf['db_user'], 'mysql', 'root');
@@ -204,9 +204,9 @@ function onBeforeInsert() {
 		}
 
 		/* restrict the names */
-		/* crop user names if they are too long -> mysql: user: 16 chars / db: 64 chars */
+		/* crop user names if they are too long -> mysql: user: 32 chars / db: 64 chars */
 		if ($app->tform->errorMessage == ''){
-			$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
+			$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 32);
 		}
 
 		$this->dataRecord['server_id'] = 0; // we need this on all servers

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 32 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 -';

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 32 chars.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['generate_password_txt'] = 'Generate Password';

interface/web/sites/lib/lang/bg_database.lng

@@ -21,7 +21,7 @@ $wb['database_charset_change_txt'] = 'Charset на базата данни не
 $wb['remote_ips_txt'] = 'Дистанционнен достъп IPs (разделени с , и празно за  <i>всички</i>)';
 $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}- е твърде дълго. Максималната дължина трябва да е 32 символа включително префикса.';
 $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 -';

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 32 chars.';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Cancel';
 $wb['generate_password_txt'] = 'Generate Password';

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 32 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-';

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 32 caracteres.';
 $wb['btn_save_txt'] = 'Salvar';
 $wb['btn_cancel_txt'] = 'Cancelar';
 $wb['generate_password_txt'] = 'Gerar Senha';

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 32 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 -';

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 32 chars.';
 $wb['btn_save_txt'] = 'Sauvegarder';
 $wb['btn_cancel_txt'] = 'Annuler';
 $wb['generate_password_txt'] = 'Générer mot de passe';