From f91a2995d99b8cae9e6880ad11d2cee49de92679 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 12 Dec 2012 07:07:45 -0500
Subject: [PATCH] - NS field in dns slave has to be a IP address - Added missing validator for xfer field in dns zone fom
---
interface/web/dns/form/dns_slave.tform.php | 9 +--------
interface/web/dns/form/dns_soa.tform.php | 4 ++++
interface/web/dns/lib/lang/de_dns_slave.lng | 2 +-
interface/web/dns/lib/lang/en_dns_slave.lng | 2 +-
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/interface/web/dns/form/dns_slave.tform.php b/interface/web/dns/form/dns_slave.tform.php
index 038f26b..744aa87 100644
--- a/interface/web/dns/form/dns_slave.tform.php
+++ b/interface/web/dns/form/dns_slave.tform.php
@@ -106,15 +106,8 @@
'ns' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'filters' => array( 0 => array( 'event' => 'SAVE',
- 'type' => 'IDNTOASCII'),
- 1 => array( 'event' => 'SHOW',
- 'type' => 'IDNTOUTF8'),
- 2 => array( 'event' => 'SAVE',
- 'type' => 'TOLOWER')
- ),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
- 'regex' => '/^[\w\.\-]{1,255}$/',
+ 'regex' => '/^[0-9\.]{1,255}$/',
'errmsg'=> 'ns_error_regex'),
),
'default' => '',
diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index 4481d5a..a7b90f4 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -217,6 +217,10 @@
'xfer' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^[0-9\.\,]{1,255}$/',
+ 'errmsg'=> 'xfer_error_regex'),
+ ),
'default' => '',
'value' => '',
'width' => '30',
diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng
index 724d8a3..007e4f4 100644
--- a/interface/web/dns/lib/lang/de_dns_slave.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave.lng
@@ -2,7 +2,7 @@
$wb['server_id_txt'] = 'Server';
$wb['origin_txt'] = 'DNS Zone';
$wb['secondary_zone_txt'] = 'Secondary DNS Zone';
-$wb['ns_txt'] = 'NS';
+$wb['ns_txt'] = 'NS (IP-Adresse)';
$wb['active_txt'] = 'Aktiv';
$wb['limit_dns_slave_zone_txt'] = 'Die maximale Anzahl an Secondary DNS Zonen für Ihr Konto wurde erreicht.';
$wb['client_txt'] = 'Kunde';
diff --git a/interface/web/dns/lib/lang/en_dns_slave.lng b/interface/web/dns/lib/lang/en_dns_slave.lng
index 64875fb..fc27ee9 100644
--- a/interface/web/dns/lib/lang/en_dns_slave.lng
+++ b/interface/web/dns/lib/lang/en_dns_slave.lng
@@ -2,7 +2,7 @@
$wb["server_id_txt"] = 'Server';
$wb["origin_txt"] = 'DNS-Zone';
$wb["secondary_zone_txt"] = 'Secondary DNS Zone';
-$wb["ns_txt"] = 'NS';
+$wb["ns_txt"] = 'NS (IP-address)';
$wb["active_txt"] = 'Active';
$wb["limit_dns_slave_zone_txt"] = 'The max. number of Secondary DNS zones for your account is reached.';
$wb["client_txt"] = 'Client';
--
Gitblit v1.9.1