diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
index 6b7ac6d9de606066909251a78e7d8cb6569f1c73..6cfdfe04d53dfc70087020f4529d73d36f3fa5b5 100644
--- a/interface/lib/classes/tform_base.inc.php
+++ b/interface/lib/classes/tform_base.inc.php
@@ -941,37 +941,54 @@ class tform_base {
}
}
break;
+ case 'V6PREFIXEND':
+ $explode_field_value = explode(':',$field_value);
+// if ($explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]=='' ){ }
+ if (!$explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]!='' ) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."
\r\n";
+ }
+ }
+ break;
+ case 'V6PREFIXLENGTH':
+ // find shortes ipv6 subnet can`t be longer
+ $sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' ORDER BY CHAR_LENGTH(ip_address) ASC LIMIT 0,1;");
+ $sql_v6_explode=explode(':',$sql_v6['ip_address']);
+ $explode_field_value = explode(':',$field_value);
+ if (count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address'])) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg].$sql_v6[ip_address]."
\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."
\r\n";
+ }
+ }
+ break;
case 'ISV6PREFIX':
- $v6_prefix_ok = 0;
- $explode_field_value = explode(':', $field_value);
+ $v6_prefix_ok=0;
+ $explode_field_value = explode(':',$field_value);
if ($explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]=='' ){
if ( count($explode_field_value) <= 9 ) {
- if(filter_var(substr($field_value, 0, strlen($field_value)-2), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) or filter_var(substr($field_value, 0, strlen($field_value)-2).'::0', FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) or filter_var(substr($field_value, 0, strlen($field_value)-2).':0', FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ) {
+ if (filter_var(substr($field_value,0,strlen($field_value)-2),FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).'::0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).':0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) ) {
$v6_prefix_ok = 1;
}
}
- } else {
- $v6_prefix_ok = 2;
}
- // check subnet against defined server-ipv6
- $sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' LIMIT 0,1");
- $sql_v6_explode=explode(':', $sql_v6['ip_address']);
- if ( count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address']) ) {
- $v6_prefix_ok = 3;
- }
- if($v6_prefix_ok == 0) {
+ if($v6_prefix_ok <> 1) {
$errmsg = $validator['errmsg'];
- }
- if($v6_prefix_ok == 2) {
- $errmsg = 'IPv6 Prefix must end with ::';
- }
- if($v6_prefix_ok == 3) {
- $errmsg = 'IPv6 Prefix too long (according to Server IP Addresses)';
- }
- if($v6_prefix_ok <> 1){
- $this->errorMessage .= $errmsg."
\r\n";
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."
\r\n";
+ }
}
break;
+
+
+
case 'ISIPV4':
$vip=1;
if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 90c758984844e0f68fe0d59b1316cc46249c54ff..ade8c13970d6c28b6613e05ed5475816c2055fa7 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -89,8 +89,12 @@ $form["tabs"]['server'] = array(
'v6_prefix' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'validators' => array(0 => array('type' => 'ISV6PREFIX',
- 'errmsg' => 'v6_prefix_wrong'),
+ 'validators' => array( 0 => array('type' => 'ISV6PREFIX',
+ 'errmsg' => 'v6_prefix_wrong'),
+ 1 => array('type' => 'V6PREFIXEND',
+ 'errmsg' => 'v6_prefix_end'),
+ 2 => array('type' => 'V6PREFIXLENGTH',
+ 'errmsg' => 'v6_prefix_length')
),
'default' => ''
),
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 1f1ad0db78307ae468edc3d97b50bb5412c97cbb..749899a7ff71ae7d0a47a4b90e3d6551d9869516 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -191,4 +191,7 @@ $wb['munin_user_txt'] = 'Munin User';
$wb['munin_password_txt'] = 'Munin Password';
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
$wb['munin_url_note_txt'] = 'Placeholder:';
+$wb["v6_prefix_txt"] = 'IPv6 Prefix';
+$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
+$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
?>
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 6656634b16265ac5f148fe22a5a03bc4514f748c..89ba859129304248e259a3ec446a37ab90213f0a 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -35,14 +35,12 @@
{tmpl_var name='website_autoalias_note_txt'} [client_id], [client_username], [website_id], [website_domain]
-