From c2dd9c58d6d3590c519e42bb2ec8e6a56e071118 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jan 2016 02:03:41 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/dns/form/dns_a.tform.php |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/interface/web/dns/form/dns_a.tform.php b/interface/web/dns/form/dns_a.tform.php
index cd5a3eb..d9ed197 100644
--- a/interface/web/dns/form/dns_a.tform.php
+++ b/interface/web/dns/form/dns_a.tform.php
@@ -105,12 +105,10 @@
 		'data' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
-			'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
-					'errmsg'=> 'data_error_empty'),
-				1 => array ( 'type' => 'REGEX',
-					'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])$/',
-					'errmsg'=> 'data_error_regex'),
-			),
+			'validators' => array (  
+				0 => array ( 'type' => 'NOTEMPTY', 'errmsg'=> 'data_error_empty'),
+				1 => array ( 'type' => 'ISIPV4', 'errmsg'=> 'ip_error_wrong'),
+            ),
 			'default' => '',
 			'value'  => '',
 			'width'  => '30',

--
Gitblit v1.9.1