Commit f0a6f489 authored by Jesse Norell's avatar Jesse Norell
Browse files

allow 1-char domain names

parent 908f26b5
...@@ -276,18 +276,20 @@ if($_POST['create'] == 1) { ...@@ -276,18 +276,20 @@ if($_POST['create'] == 1) {
} }
# fixme: this regex is pretty poor for domain validation
if(isset($_POST['domain']) && $_POST['domain'] == '') $error .= $app->lng('error_domain_empty').'<br />'; if(isset($_POST['domain']) && $_POST['domain'] == '') $error .= $app->lng('error_domain_empty').'<br />';
elseif(isset($_POST['domain']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9\-]{2,63}$/', $_POST['domain'])) $error .= $app->lng('error_domain_regex').'<br />'; elseif(isset($_POST['domain']) && !preg_match('/^[\w\.\-]{1,64}\.[a-zA-Z0-9\-]{2,63}$/', $_POST['domain'])) $error .= $app->lng('error_domain_regex').'<br />';
if(isset($_POST['ip']) && $_POST['ip'] == '') $error .= $app->lng('error_ip_empty').'<br />'; if(isset($_POST['ip']) && $_POST['ip'] == '') $error .= $app->lng('error_ip_empty').'<br />';
if(isset($_POST['ipv6']) && $_POST['ipv6'] == '') $error .= $app->lng('error_ipv6_empty').'<br />'; if(isset($_POST['ipv6']) && $_POST['ipv6'] == '') $error .= $app->lng('error_ipv6_empty').'<br />';
# fixme: this regex is pretty poor for hostname validation
if(isset($_POST['ns1']) && $_POST['ns1'] == '') $error .= $app->lng('error_ns1_empty').'<br />'; if(isset($_POST['ns1']) && $_POST['ns1'] == '') $error .= $app->lng('error_ns1_empty').'<br />';
elseif(isset($_POST['ns1']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,63}$/', $_POST['ns1'])) $error .= $app->lng('error_ns1_regex').'<br />'; elseif(isset($_POST['ns1']) && !preg_match('/^[\w\.\-]{1,64}\.[a-zA-Z0-9]{2,63}$/', $_POST['ns1'])) $error .= $app->lng('error_ns1_regex').'<br />';
if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty').'<br />'; if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty').'<br />';
elseif(isset($_POST['ns2']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z0-9]{2,63}$/', $_POST['ns2'])) $error .= $app->lng('error_ns2_regex').'<br />'; elseif(isset($_POST['ns2']) && !preg_match('/^[\w\.\-]{1,64}\.[a-zA-Z0-9]{2,63}$/', $_POST['ns2'])) $error .= $app->lng('error_ns2_regex').'<br />';
if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty').'<br />'; if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty').'<br />';
elseif(isset($_POST['email']) && filter_var($_POST['email'], FILTER_VALIDATE_EMAIL) === false) $error .= $app->lng('error_email_regex').'<br />'; elseif(isset($_POST['email']) && filter_var($_POST['email'], FILTER_VALIDATE_EMAIL) === false) $error .= $app->lng('error_email_regex').'<br />';
...@@ -326,7 +328,7 @@ if($_POST['create'] == 1) { ...@@ -326,7 +328,7 @@ if($_POST['create'] == 1) {
// $enable_dnssec = (($_POST['dnssec'] == 'Y') ? 'Y' : 'N'); // $enable_dnssec = (($_POST['dnssec'] == 'Y') ? 'Y' : 'N');
// if(isset($_POST['dnssec'])) $vars['dnssec_wanted'] = 'Y'; // if(isset($_POST['dnssec'])) $vars['dnssec_wanted'] = 'Y';
if(isset($_POST['dnssec'])) $tpl_content = str_replace('[ZONE]', '[ZONE]'."\n".'dnssec_wanted=Y', $tpl_content); if(isset($_POST['dnssec'])) $tpl_content = str_replace('[ZONE]', '[ZONE]'."\n".'dnssec_wanted=Y', $tpl_content);
if(isset($_POST['dkim']) && preg_match('/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,63}[\.]{0,1}$/', $_POST['domain'])) { if(isset($_POST['dkim']) && preg_match('/^[\w\.\-\/]{1,255}\.[a-zA-Z0-9\-]{2,63}[\.]{0,1}$/', $_POST['domain'])) {
$sql = $app->db->queryOneRecord("SELECT dkim_public, dkim_selector FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'), $_POST['domain']); $sql = $app->db->queryOneRecord("SELECT dkim_public, dkim_selector FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'), $_POST['domain']);
$public_key = $sql['dkim_public']; $public_key = $sql['dkim_public'];
if ($public_key!='') { if ($public_key!='') {
......
...@@ -96,7 +96,7 @@ $form["tabs"]['dns_slave'] = array ( ...@@ -96,7 +96,7 @@ $form["tabs"]['dns_slave'] = array (
'errmsg'=> 'origin_error_unique'), 'errmsg'=> 'origin_error_unique'),
*/ */
1 => array ( 'type' => 'REGEX', 1 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-9\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,63}[\.]{0,1}$/', 'regex' => '/^[a-zA-Z0-9\.\-\/]{1,255}\.[a-zA-Z0-9\-]{2,63}[\.]{0,1}$/',
'errmsg'=> 'origin_error_regex'), 'errmsg'=> 'origin_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -120,7 +120,7 @@ $form["tabs"]['dns_soa'] = array ( ...@@ -120,7 +120,7 @@ $form["tabs"]['dns_soa'] = array (
1 => array ( 'type' => 'UNIQUE', 1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'origin_error_unique'), 'errmsg'=> 'origin_error_unique'),
2 => array ( 'type' => 'REGEX', 2 => array ( 'type' => 'REGEX',
'regex' => '/^[a-zA-Z0-9\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,63}[\.]{0,1}$/', 'regex' => '/^[a-zA-Z0-9\.\-\/]{1,255}\.[a-zA-Z0-9\-]{2,63}[\.]{0,1}$/',
'errmsg'=> 'origin_error_regex'), 'errmsg'=> 'origin_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -86,7 +86,7 @@ $form["tabs"]['catchall'] = array ( ...@@ -86,7 +86,7 @@ $form["tabs"]['catchall'] = array (
1 => array ( 'type' => 'UNIQUE', 1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'domain_error_unique'), 'errmsg'=> 'domain_error_unique'),
2 => array ( 'type' => 'REGEX', 2 => array ( 'type' => 'REGEX',
'regex' => '/^\@[\w\.\-]{2,255}\.[a-zA-Z\-]{2,63}$/', 'regex' => '/^\@[\w\.\-]{1,255}\.[a-zA-Z\-]{2,63}$/',
'errmsg'=> 'domain_error_regex'), 'errmsg'=> 'domain_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -87,7 +87,7 @@ $form["tabs"]['mailinglist'] = array ( ...@@ -87,7 +87,7 @@ $form["tabs"]['mailinglist'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'domain_error_empty'), 'errmsg'=> 'domain_error_empty'),
1 => array ( 'type' => 'REGEX', 1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z\-]{2,10}$/', 'regex' => '/^[\w\.\-]{1,255}\.[a-zA-Z\-]{2,10}$/',
'errmsg'=> 'domain_error_regex'), 'errmsg'=> 'domain_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -103,7 +103,7 @@ $form["tabs"]['domain'] = array ( ...@@ -103,7 +103,7 @@ $form["tabs"]['domain'] = array (
1 => array ( 'type' => 'UNIQUE', 1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'domain_error_unique'), 'errmsg'=> 'domain_error_unique'),
2 => array ( 'type' => 'REGEX', 2 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,63}$/', 'regex' => '/^[\w\.\-]{1,255}\.[a-zA-Z0-9\-]{2,63}$/',
'errmsg'=> 'domain_error_regex'), 'errmsg'=> 'domain_error_regex'),
), ),
'default' => '', 'default' => '',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment