diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php index 784b9c442cdc5441c645872e10df9f2a2f4286d5..fcde405ebca90af89d8512242de871cd15a53dac 100644 --- a/interface/lib/classes/remoting_lib.inc.php +++ b/interface/lib/classes/remoting_lib.inc.php @@ -551,6 +551,27 @@ class remoting_lib { } } } + break; + case 'RANGE': + //* Checks if the value is within the given range or above / below a value + //* Range examples: < 10 = ":10", between 2 and 10 = "2:10", above 5 = "5:". + $range_parts = explode(':',trim($validator['range'])); + $ok = true; + if($range_parts[0] != '' && $field_value < $range_parts[0]) { + $ok = false; + } + if($range_parts[1] != '' && $field_value > $range_parts[1]) { + $ok = false; + } + if($ok != true) { + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + } else { + $this->errorMessage .= $errmsg."
\r\n"; + } + } + unset($range_parts); break; case 'CUSTOM': // Calls a custom class to validate this record diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index c1d1201439e7a3f7456ee1cb1e4adf2b87ed3e30..b01ea9109a2b49d5dad6f84712f7ea850a246f3a 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -931,6 +931,27 @@ class tform { } } } + break; + case 'RANGE': + //* Checks if the value is within the given range or above / below a value + //* Range examples: < 10 = ":10", between 2 and 10 = "2:10", above 5 = "5:". + $range_parts = explode(':',trim($validator['range'])); + $ok = true; + if($range_parts[0] != '' && $field_value < $range_parts[0]) { + $ok = false; + } + if($range_parts[1] != '' && $field_value > $range_parts[1]) { + $ok = false; + } + if($ok != true) { + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; + } else { + $this->errorMessage .= $errmsg."
\r\n"; + } + } + unset($range_parts); break; case 'CUSTOM': // Calls a custom class to validate this record diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php index c102e126fc00f36082536305705cfad9f9a92366..16e9b11e0c6eede5e3c2bb178bd0433c6549c588 100644 --- a/interface/web/dns/form/dns_soa.tform.php +++ b/interface/web/dns/form/dns_soa.tform.php @@ -135,6 +135,10 @@ $form["tabs"]['dns_soa'] = array ( 'refresh' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'RANGE', + 'range' => '60:', + 'errmsg'=> 'refresh_range_error'), + ), 'default' => '7200', 'value' => '', 'width' => '10', @@ -143,6 +147,10 @@ $form["tabs"]['dns_soa'] = array ( 'retry' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'RANGE', + 'range' => '60:', + 'errmsg'=> 'retry_range_error'), + ), 'default' => '540', 'value' => '', 'width' => '10', @@ -151,6 +159,10 @@ $form["tabs"]['dns_soa'] = array ( 'expire' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'RANGE', + 'range' => '60:', + 'errmsg'=> 'expire_range_error'), + ), 'default' => '604800', 'value' => '', 'width' => '10', @@ -159,6 +171,10 @@ $form["tabs"]['dns_soa'] = array ( 'minimum' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'RANGE', + 'range' => '60:', + 'errmsg'=> 'minimum_range_error'), + ), 'default' => '86400', 'value' => '', 'width' => '10', @@ -167,6 +183,10 @@ $form["tabs"]['dns_soa'] = array ( 'ttl' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'RANGE', + 'range' => '60:', + 'errmsg'=> 'ttl_range_error'), + ), 'default' => '3600', 'value' => '', 'width' => '10', diff --git a/interface/web/dns/lib/lang/en_dns_soa.lng b/interface/web/dns/lib/lang/en_dns_soa.lng index 95afad415f7063b30478cf3e4961a23efcca1024..d5260933120f0a299e7595540e940a5bca7ee92e 100644 --- a/interface/web/dns/lib/lang/en_dns_soa.lng +++ b/interface/web/dns/lib/lang/en_dns_soa.lng @@ -29,4 +29,9 @@ $wb['eg_domain_tld'] = 'e.g. domain.tld'; $wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld'; $wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld'; $wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'; +$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.'; +$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; +$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.'; +$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.'; +$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.'; ?>