Skip to content

Commit c2dd9c5

Browse files
author
Marius Burkard
committed
Merge branch 'master' into 'master'
 some more filter_var for ipv4 / ipv6 See merge request !260
2 parents 44a5ae6 + 85459c8 commit c2dd9c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+58
-82
lines changed

‎interface/lib/classes/validate_database.inc.php‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,11 @@ function valid_ip_list($field_name, $field_value, $validator) {
4444
$cur_value = trim($cur_value);
4545
$valid = true;
4646
if(function_exists('filter_var')) {
47-
if(!filter_var($field_value, FILTER_VALIDATE_IP)) {
47+
if(!filter_var($cur_value, FILTER_VALIDATE_IP)) {
4848
$valid = false;
4949
}
50-
} else {
51-
if(
52-
!preg_match("/^[0-9a-f]{1,4}:([0-9a-f]{0,4}:){1,6}[0-9a-f]{1,4}$/", $cur_value)
53-
&&
54-
!preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $cur_value)) {
55-
$valid = false;
56-
}
57-
}
50+
} else return "function filter_var missing <br />\r\n";
51+
5852
if($valid == false) {
5953
$errmsg = $validator['errmsg'];
6054
if(isset($app->tform->wordbook[$errmsg])) {

‎interface/lib/classes/validate_dns.inc.php‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -309,21 +309,7 @@ function validate_xfer($field_name, $field_value, $validator) {
309309
$errmsg = $validator['errmsg'];
310310
$errorMessage .= $app->tform->lng($errmsg)."<br />\r\n";
311311
}
312-
} else {
313-
//* Check content with regex, if we use php < 5.2
314-
$ip_ok = 0;
315-
if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
316-
$ip_ok = 1;
317-
}
318-
// if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
319-
if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $field_value)){
320-
$ip_ok = 1;
321-
}
322-
if($ip_ok == 0) {
323-
$errmsg = $validator['errmsg'];
324-
$errorMessage .= $app->tform->lng($errmsg)."<br />\r\n";
325-
}
326-
}
312+
} else $this->errorMessage .= "function filter_var missing <br />\r\n";
327313
}
328314
}
329315
return $errorMessage;

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,10 @@
105105
'data' => array (
106106
'datatype' => 'VARCHAR',
107107
'formtype' => 'TEXT',
108-
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
109-
'errmsg'=> 'data_error_empty'),
110-
1 => array ( 'type' => 'REGEX',
111-
'regex' => '/^([1-9]{1}|[1-9]\d|[1]\d\d|2[0-4]\d|25[0-5])\.(\d{1}|[1-9]\d|[1]\d\d|2[0-4]\d|25[0-5])\.(\d{1}|[1-9]\d|[1]\d\d|2[0-4]\d|25[0-5])\.(\d{1}|[1-9]\d|[1]\d\d|2[0-4]\d|25[0-5])$/',
112-
'errmsg'=> 'data_error_regex'),
113-
),
108+
'validators' => array (
109+
0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'),
110+
1 => array ( 'type' => 'ISIPV4', 'errmsg'=> 'ip_error_wrong'),
111+
),
114112
'default' => '',
115113
'value' => '',
116114
'width' => '30',

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,15 @@
9898
'data' => array (
9999
'datatype' => 'VARCHAR',
100100
'formtype' => 'TEXT',
101-
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
102-
'errmsg'=> 'data_error_empty'),
103-
1 => array ( 'type' => 'REGEX',
104-
'regex' => '/^\s*((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}(:|((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:)(:[0-9A-Fa-f]{1,4}){0,4}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(:(:[0-9A-Fa-f]{1,4}){0,5}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))(%.+)?\s*$/',
105-
'errmsg'=> 'data_error_regex'),
101+
'validators' => array (
102+
0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'),
103+
1 => array ( 'type' => 'ISIPV6', 'errmsg'=> 'ip_error_wrong'),
106104
),
107-
'default' => '',
108105
'value' => '',
109106
'width' => '30',
110107
'maxlength' => '255'
111108
),
109+
'default' => '',
112110
/*
113111
'aux' => array (
114112
'datatype' => 'INTEGER',

‎interface/web/dns/lib/lang/ar_dns_a.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DN
1111
$wb['name_error_empty'] = 'The hostname is empty.';
1212
$wb['name_error_regex'] = 'The hostname has the wrong format.';
1313
$wb['data_error_empty'] = 'IP-Address empty';
14-
$wb['data_error_regex'] = 'IP-Address format invalid';
14+
$wb['ip_error_wrong'] = 'IP-Address format invalid';
1515
$wb['data_error_duplicate'] = 'Duplicate A-Record';
1616
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
1717
?>

‎interface/web/dns/lib/lang/ar_dns_aaaa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DN
1111
$wb['name_error_empty'] = 'The hostname is empty.';
1212
$wb['name_error_regex'] = 'The hostname has the wrong format.';
1313
$wb['data_error_empty'] = 'IP-Address empty';
14-
$wb['data_error_regex'] = 'IP-Address format invalid';
14+
$wb['ip_error_wrong'] = 'IP-Address format invalid';
1515
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
1616
?>

‎interface/web/dns/lib/lang/bg_dns_a.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $wb['no_zone_perm'] = 'Нямате права да добавяте запис
1111
$wb['name_error_empty'] = 'Полето за хост име е празно.';
1212
$wb['name_error_regex'] = 'Избраното име на хост е в грешен формат.';
1313
$wb['data_error_empty'] = 'Полето за IP-адреса е празно';
14-
$wb['data_error_regex'] = 'Формата на IP-адреса е грешен';
14+
$wb['ip_error_wrong'] = 'Формата на IP-адреса е грешен';
1515
$wb['data_error_duplicate'] = 'Дублиран A-Запис';
1616
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
1717
?>

‎interface/web/dns/lib/lang/bg_dns_aaaa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ $wb['no_zone_perm'] = 'Вие нямате право да добавяте за
1111
$wb['name_error_empty'] = 'Полето с имейла е празно.';
1212
$wb['name_error_regex'] = 'The hostname has the wrong format.';
1313
$wb['data_error_empty'] = 'IP-Address empty';
14-
$wb['data_error_regex'] = 'IP-Address format invalid';
14+
$wb['ip_error_wrong'] = 'IP-Address format invalid';
1515
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
1616
?>

‎interface/web/dns/lib/lang/br_dns_a.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está
1111
$wb['name_error_empty'] = 'Hostname em branco.';
1212
$wb['name_error_regex'] = 'Hostname tem um formato inválido.';
1313
$wb['data_error_empty'] = 'Endereço IP em branco';
14-
$wb['data_error_regex'] = 'Endereço IP formato inválido';
14+
$wb['ip_error_wrong'] = 'Endereço IP formato inválido';
1515
$wb['data_error_duplicate'] = 'Registro A duplicado';
1616
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
1717
?>

‎interface/web/dns/lib/lang/br_dns_aaaa.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ $wb['no_zone_perm'] = 'Você não tem permição para adcionar registros a está
1111
$wb['name_error_empty'] = 'O Hostname está em branco.';
1212
$wb['name_error_regex'] = 'O Hostname está com formato inválido.';
1313
$wb['data_error_empty'] = 'Endereço IP em branco';
14-
$wb['data_error_regex'] = 'Endereço IP com formato inválido';
14+
$wb['ip_error_wrong'] = 'Endereço IP com formato inválido';
1515
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
1616
?>

0 commit comments

Comments
 (0)