Implemented #4910 Do not permit to add subdomains of domain acme.invalid

interface/lib/classes/validate_domain.inc.php

@@ -51,6 +51,9 @@ class validate_domain {
 
 		$result = $this->_check_unique($field_value);
 		if(!$result) return $this->get_error('domain_error_unique');
+		
+		$pattern = '/\.acme\.invalid$/';
+		if(preg_match($pattern, $field_value)) return $this->get_error('domain_error_acme_invalid');
 	}
 
 	/* Validator function for sub domain */
@@ -65,6 +68,9 @@ class validate_domain {
 
 		$result = $this->_check_unique($field_value);
 		if(!$result) return $this->get_error('domain_error_unique');
+		
+		$pattern = '/\.acme\.invalid$/';
+		if(preg_match($pattern, $field_value)) return $this->get_error('domain_error_acme_invalid');
 	}
 
 	/* Validator function for alias domain */
@@ -77,6 +83,9 @@ class validate_domain {
 
 		$result = $this->_check_unique($field_value);
 		if(!$result) return $this->get_error('domain_error_unique');
+		
+		$pattern = '/\.acme\.invalid$/';
+		if(preg_match($pattern, $field_value)) return $this->get_error('domain_error_acme_invalid');
 	}
 
 	/* Validator function for checking the auto subdomain of a web/aliasdomain */

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

@@ -43,6 +43,7 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';

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

@@ -8,6 +8,7 @@ $wb['add_new_record_txt'] = 'Add new aliasdomain';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';

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

@@ -35,6 +35,7 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
 $wb['no_redirect_txt'] = 'No redirect';

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

@@ -7,6 +7,7 @@ $wb['domain_txt'] = 'Subdomain';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';

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

@@ -38,6 +38,7 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
 $wb['error_ssl_state_empty'] = 'SSL State is empty.';

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

@@ -35,6 +35,7 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
 $wb['no_redirect_txt'] = 'No redirect';

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

@@ -39,6 +39,7 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
 $wb['error_ssl_state_empty'] = 'SSL State is empty.';

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

@@ -47,6 +47,7 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';

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

@@ -43,6 +43,7 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';

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

@@ -47,6 +47,7 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';

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

@@ -35,6 +35,7 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';

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

@@ -9,6 +9,7 @@ $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';

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

@@ -43,6 +43,7 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';

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

@@ -47,6 +47,7 @@ $wb['apache_directives_txt'] = 'Apache Directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';

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

@@ -35,6 +35,7 @@ $wb['apache_directives_txt'] = 'Apache-Direktiven';
 $wb['domain_error_empty'] = 'Domain ist leer.';
 $wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
 $wb['domain_error_regex'] = 'Domain-Name ist ungültig.';
+$wb['domain_error_acme_invalid'] = 'Domainname acme.invalid ist nicht erlaubt.';
 $wb['domain_error_wildcard'] = 'Wildcard Subdomains sind nicht erlaubt.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Pfade sind beispielsweise: /test/ oder http://www.domain.tld/test/';

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

@@ -38,6 +38,7 @@ $wb['apache_directives_txt'] = 'Apache Direktiven';
 $wb['domain_error_empty'] = 'Domain ist leer.';
 $wb['domain_error_unique'] = 'Domain muss eindeutig sein';
 $wb['domain_error_regex'] = 'Domain Name ungültig.';
+$wb['domain_error_acme_invalid'] = 'Domainname acme.invalid ist nicht erlaubt.';
 $wb['domain_error_autosub'] = 'Es existiert bereits eine Subdomain mit diesen Einstellungen.';
 $wb['hd_quota_error_empty'] = 'Speicherplatzbeschränkung ist leer.';
 $wb['traffic_quota_error_empty'] = 'Transfervolumenbeschränkung ist leer.';

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

@@ -41,6 +41,7 @@ $wb['apache_directives_txt'] = 'Apache-Direktiven';
 $wb['domain_error_empty'] = 'Domain ist leer.';
 $wb['domain_error_unique'] = 'Domain muss eindeutig sein';
 $wb['domain_error_regex'] = 'Domain-Name ungültig.';
+$wb['domain_error_acme_invalid'] = 'Domainname acme.invalid ist nicht erlaubt.';
 $wb['domain_error_wildcard'] = 'Wildcard-Subdomains sind nicht erlaubt.';
 $wb['hd_quota_error_empty'] = 'Harddisk-Quota ist leer.';
 $wb['traffic_quota_error_empty'] = 'Traffic-Quota ist leer.';

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

@@ -35,6 +35,7 @@ $wb['apache_directives_txt'] = 'Apache directives';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';

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

@@ -9,6 +9,7 @@ $wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_acme_invalid'] = 'Domain name acme.invalid not permitted.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';