Merge branch '5976-disallow_empty_web_folders' into 'develop'

don't allow empty web_folder

Closes #5976

See merge request ispconfig/ispconfig3!1368

Author: Marius Burkard

interface/web/sites/form/web_vhost_domain.tform.php

@@ -367,12 +367,14 @@
 	);
 	$form['tabs']['domain']['fields']['web_folder'] = array (
 		'datatype' => 'VARCHAR',
-		'validators' => array (  0 => array ( 'type' => 'REGEX',
-				'regex' => '@^((?!(.*\.\.)|(.*\./)|(.*//))[^/][\w/_\.\-]{1,100})?$@',
-				'errmsg'=> 'web_folder_error_regex'),
+		'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
+						'errmsg'=> 'web_folder_error_empty'),
+					1 => array ( 'type' => 'REGEX',
+						'regex' => '@^((?!(.*\.\.)|(.*\./)|(.*//))[^/][\w/_\.\-]{1,100})?$@',
+						'errmsg'=> 'web_folder_error_regex'),
 		),
-		'filters'   => array( 0 => array( 	'event' => 'SAVE',
-											'type' => 'TRIM'),
+		'filters'   => array( 0 => array( 'event' => 'SAVE',
+						'type' => 'TRIM'),
 		),
 		'formtype' => 'TEXT',
 		'default' => '',

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

@@ -114,6 +114,7 @@ $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
 $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['web_folder_error_empty'] = 'Web folder cannot be empty.  Use /web/ to make the same as the Parent Website';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';

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

@@ -20,6 +20,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['host_txt'] = 'Hostname';
 $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['web_folder_error_empty'] = 'Web folder cannot be empty.  Use /web/ to make the same as the Parent Website';
 $wb['type_txt'] = 'Type';
 $wb['redirect_type_txt'] = 'Redirect Type';
 $wb['r_redirect_txt'] = 'R (Temporary redirect)';
@@ -132,4 +133,3 @@ $wb['http_port_txt'] = 'HTTP Port';
 $wb['https_port_txt'] = 'HTTPS Port';
 $wb['http_port_error_regex'] = 'HTTP Port invalid.';
 $wb['https_port_error_regex'] = 'HTTPS Port invalid.';
-?>

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

@@ -113,6 +113,7 @@ $wb['password_match_txt'] = 'The passwords do match.';
 $wb['ssl_key_txt'] = 'SSL Key';
 $wb['perl_txt'] = 'Perl';
 $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['web_folder_error_empty'] = 'Web folder cannot be empty.  Use /web/ to make the same as the Parent Website';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';

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

@@ -20,6 +20,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['host_txt'] = 'Hostname';
 $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['web_folder_error_empty'] = 'Web folder cannot be empty.  Use /web/ to make the same as the Parent Website';
 $wb['type_txt'] = 'Type';
 $wb['redirect_type_txt'] = 'Redirect Type';
 $wb['r_redirect_txt'] = 'R (Temporary redirect)';
@@ -132,4 +133,3 @@ $wb['http_port_txt'] = 'HTTP Port';
 $wb['https_port_txt'] = 'HTTPS Port';
 $wb['http_port_error_regex'] = 'HTTP Port invalid.';
 $wb['https_port_error_regex'] = 'HTTPS Port invalid.';
-?>

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

@@ -15,6 +15,7 @@ $wb['ssl_domain_txt'] = 'Domínio SSL';
 $wb['server_id_txt'] = 'Servidor';
 $wb['domain_txt'] = 'Domínio';
 $wb['web_folder_error_regex'] = 'Pasta web é inválida. Por favor não utilize o caractere  (barra).';
+$wb['web_folder_error_empty'] = 'Web folder cannot be empty.  Use /web/ to make the same as the Parent Website';
 $wb['type_txt'] = 'Tipo';
 $wb['parent_domain_id_txt'] = 'Site Pai';
 $wb['redirect_type_txt'] = 'Tipo de redirecionamento';

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

@@ -20,6 +20,7 @@ $wb['server_id_txt'] = 'Servidor';
 $wb['domain_txt'] = 'Domínio';
 $wb['host_txt'] = 'Nome do host';
 $wb['web_folder_error_regex'] = 'Pasta Web é inválida. Por favor não utilize o caractere  (barra).';
+$wb['web_folder_error_empty'] = 'Web folder cannot be empty.  Use /web/ to make the same as the Parent Website';
 $wb['type_txt'] = 'Tipo';
 $wb['redirect_type_txt'] = 'Tipo de redirecionamento';
 $wb['r_redirect_txt'] = 'R (Temporary redirect)';

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

@@ -15,6 +15,7 @@ $wb['ssl_domain_txt'] = 'SSL Domain';
 $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['web_folder_error_empty'] = 'Web folder cannot be empty.  Use /web/ to make the same as the Parent Website';
 $wb['type_txt'] = 'Type';
 $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';

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

@@ -20,6 +20,7 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['host_txt'] = 'Hostname';
 $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['web_folder_error_empty'] = 'Web folder cannot be empty.  Use /web/ to make the same as the Parent Website';
 $wb['type_txt'] = 'Type';
 $wb['redirect_type_txt'] = 'Redirect Type';
 $wb['r_redirect_txt'] = 'R (Temporary redirect)';
@@ -132,4 +133,3 @@ $wb['http_port_txt'] = 'HTTP Port';
 $wb['https_port_txt'] = 'HTTPS Port';
 $wb['http_port_error_regex'] = 'HTTP Port invalid.';
 $wb['https_port_error_regex'] = 'HTTPS Port invalid.';
-?>

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

@@ -20,6 +20,7 @@ $wb['domain_txt'] = 'Doména';
 $wb['type_txt'] = 'Verze';
 $wb['host_txt'] = 'Název hostitele';
 $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['web_folder_error_empty'] = 'Web folder cannot be empty.  Use /web/ to make the same as the Parent Website';
 $wb['redirect_type_txt'] = 'Typ přesměrování';
 $wb['r_redirect_txt'] = 'R (Temporary redirect)';
 $wb['l_redirect_txt'] = 'L (Last redirect rule)';