Commit 28eadb79 authored by tbrehm's avatar tbrehm
Browse files

Fixed: FS#1332 - Punycoded russian domain names in ISPConfig 3

parent 06b7fa91
...@@ -734,7 +734,7 @@ class tform { ...@@ -734,7 +734,7 @@ class tform {
} }
break; break;
case 'ISEMAIL': case 'ISEMAIL':
if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-z]{2,10}$/i", $field_value)) { if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-z\-]{2,10}$/i", $field_value)) {
$errmsg = $validator['errmsg']; $errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) { if(isset($this->wordbook[$errmsg])) {
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n"; $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
......
...@@ -138,10 +138,10 @@ if($_POST['create'] == 1) { ...@@ -138,10 +138,10 @@ if($_POST['create'] == 1) {
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 />';
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 />';
if(isset($_POST['domain']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z]{2,10}[\.]{0,1}$/',$_POST['domain'])) $error .= $app->lng('error_domain_regex').'<br />'; if(isset($_POST['domain']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z\-]{2,10}[\.]{0,1}$/',$_POST['domain'])) $error .= $app->lng('error_domain_regex').'<br />';
if(isset($_POST['ns1']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z]{2,10}[\.]{0,1}$/',$_POST['ns1'])) $error .= $app->lng('error_ns1_regex').'<br />'; if(isset($_POST['ns1']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z]{2,10}[\.]{0,1}$/',$_POST['ns1'])) $error .= $app->lng('error_ns1_regex').'<br />';
if(isset($_POST['ns2']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z]{2,10}[\.]{0,1}$/',$_POST['ns2'])) $error .= $app->lng('error_ns2_regex').'<br />'; if(isset($_POST['ns2']) && !preg_match('/^[\w\.\-]{2,64}\.[a-zA-Z]{2,10}[\.]{0,1}$/',$_POST['ns2'])) $error .= $app->lng('error_ns2_regex').'<br />';
if(isset($_POST['email']) && !preg_match('/^\w+[\w.-]*\w+@\w+[\w.-]*\w+\.[a-z]{2,10}$/i',$_POST['email'])) $error .= $app->lng('error_email_regex').'<br />'; if(isset($_POST['email']) && !preg_match('/^\w+[\w.-]*\w+@\w+[\w.-]*\w+\.[a-z\-]{2,10}$/i',$_POST['email'])) $error .= $app->lng('error_email_regex').'<br />';
// make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it // make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it
if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($_POST['client_group_id'])) { if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($_POST['client_group_id'])) {
......
...@@ -82,7 +82,7 @@ $form["tabs"]['dns_soa'] = array ( ...@@ -82,7 +82,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' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z]{2,10}[\.]{0,1}$/', 'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z\-]{2,10}[\.]{0,1}$/',
'errmsg'=> 'origin_error_regex'), 'errmsg'=> 'origin_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -93,7 +93,7 @@ $form["tabs"]['domain'] = array ( ...@@ -93,7 +93,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-Z]{2,10}$/', 'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z\-]{2,10}$/',
'errmsg'=> 'domain_error_regex'), 'errmsg'=> 'domain_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -74,7 +74,7 @@ $form["tabs"]['alias'] = array ( ...@@ -74,7 +74,7 @@ $form["tabs"]['alias'] = array (
1 => array ( 'type' => 'UNIQUE', 1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'source_error_unique'), 'errmsg'=> 'source_error_unique'),
2 => array ( 'type' => 'REGEX', 2 => array ( 'type' => 'REGEX',
'regex' => '/^\@[\w\.\-]{2,64}\.[a-zA-Z]{2,10}$/', 'regex' => '/^\@[\w\.\-]{2,64}\.[a-zA-Z\-]{2,10}$/',
'errmsg'=> 'source_error_regex'), 'errmsg'=> 'source_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -77,7 +77,7 @@ $form["tabs"]['domain'] = array ( ...@@ -77,7 +77,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-Z]{2,10}$/', 'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z\-]{2,10}$/',
'errmsg'=> 'domain_error_regex'), 'errmsg'=> 'domain_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -74,7 +74,7 @@ $form["tabs"]['catchall'] = array ( ...@@ -74,7 +74,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,10}$/', 'regex' => '/^\@[\w\.\-]{2,255}\.[a-zA-Z\-]{2,10}$/',
'errmsg'=> 'domain_error_regex'), 'errmsg'=> 'domain_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -81,7 +81,7 @@ $form["tabs"]['mailget'] = array ( ...@@ -81,7 +81,7 @@ $form["tabs"]['mailget'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'source_server_error_isempty'), 'errmsg'=> 'source_server_error_isempty'),
1 => array ( 'type' => 'REGEX', 1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{2,64}\.[a-zA-Z]{2,10}$/', 'regex' => '/^[\w\.\-]{2,64}\.[a-zA-Z\-]{2,10}$/',
'errmsg'=> 'source_server_error_regex'), 'errmsg'=> 'source_server_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -114,7 +114,7 @@ $form["tabs"]['mailuser'] = array ( ...@@ -114,7 +114,7 @@ $form["tabs"]['mailuser'] = array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX', 'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-z]{2,10}){0,1}$/i', 'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-z\-]{2,10}){0,1}$/i',
'errmsg'=> 'cc_error_isemail'), 'errmsg'=> 'cc_error_isemail'),
), ),
'default' => '', 'default' => '',
......
...@@ -77,7 +77,7 @@ $form["tabs"]['domain'] = array ( ...@@ -77,7 +77,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-Z]{2,10}$/', 'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z\-]{2,10}$/',
'errmsg'=> 'domain_error_regex'), 'errmsg'=> 'domain_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -97,7 +97,7 @@ $form["tabs"]['domain'] = array ( ...@@ -97,7 +97,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-Z]{2,10}$/', 'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z\-]{2,10}$/',
'errmsg'=> 'domain_error_regex'), 'errmsg'=> 'domain_error_regex'),
), ),
'default' => '', 'default' => '',
......
...@@ -77,7 +77,7 @@ $form["tabs"]['domain'] = array ( ...@@ -77,7 +77,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-Z]{2,10}$/', 'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z\-]{2,10}$/',
'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