Merge branch 'master' into 'master'

[DNS] Allow free standing @ as hostname

Currently, the regex checking the hostname for adding new DNS records doesn't allow `@` as the hostname. This PR adds support for that for `A`, `AAAA`, `MX` and `TXT` records. Not sure if any other DNS record types allow `@` as hostname, but happy to amend this PR if that's the case.

See merge request !521

Author: Till Brehm

interface/web/dns/form/dns_a.tform.php

@@ -86,7 +86,7 @@
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-\*]{0,64}$/',
+					'regex' => '/^([a-zA-Z0-9\.\-\*]{0,64}|@)$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',

interface/web/dns/form/dns_aaaa.tform.php

@@ -79,7 +79,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-\*]{0,64}$/',
+					'regex' => '/^([a-zA-Z0-9\.\-\*]{0,64}|@)$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',

interface/web/dns/form/dns_mx.tform.php

@@ -87,7 +87,7 @@
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-\*]{0,255}$/',
+					'regex' => '/^([a-zA-Z0-9\.\-\*]{0,255}|@)$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',

interface/web/dns/form/dns_txt.tform.php

@@ -86,7 +86,7 @@
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-\_]{0,255}$/',
+					'regex' => '/^([a-zA-Z0-9\.\-\_]{0,255}|@)$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',