From ebbe6374fc9c308daf729d2ad1b2f8007ed771ce Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 17 Feb 2014 05:34:43 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
interface/web/dns/form/dns_slave.tform.php | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/interface/web/dns/form/dns_slave.tform.php b/interface/web/dns/form/dns_slave.tform.php
index c518731..a416aed 100644
--- a/interface/web/dns/form/dns_slave.tform.php
+++ b/interface/web/dns/form/dns_slave.tform.php
@@ -96,7 +96,7 @@
'errmsg'=> 'origin_error_unique'),
*/
1 => array ( 'type' => 'REGEX',
- 'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
+ 'regex' => '/^[a-zA-Z0-9\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
'errmsg'=> 'origin_error_regex'),
),
'default' => '',
@@ -121,6 +121,11 @@
'xfer' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISIP',
+ 'allowempty' => 'y',
+ 'separator' => ',',
+ 'errmsg'=> 'xfer_error_regex'),
+ ),
'default' => '',
'value' => '',
'width' => '30',
--
Gitblit v1.9.1