From cc2fe484bff23d183277d217f4b7ca291667a506 Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Sun, 21 Dec 2008 06:55:59 -0500
Subject: [PATCH] add ip validator in some form
---
interface/web/admin/form/server_ip.tform.php | 7 ++-----
interface/web/admin/form/server_config.tform.php | 10 +++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index eb47589..0603773 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -69,7 +69,7 @@
'formtype' => 'TEXT',
'default' => '192.168.0.105',
'validators' => array ( 0 => array ( 'type' => 'ISIPV4',
- 'errmsg'=> 'ip_address_error_empty'),
+ 'errmsg'=> 'ip_address_error_wrong'),
),
'value' => '',
'width' => '15',
@@ -79,8 +79,8 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '255.255.255.0',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'netmask_error_empty'),
+ 'validators' => array ( 0 => array ( 'type' => 'ISIPV4',
+ 'errmsg'=> 'netmask_error_wrong'),
),
'value' => '',
'width' => '15',
@@ -90,8 +90,8 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '192.168.0.1',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'gateway_error_empty'),
+ 'validators' => array ( 0 => array ( 'type' => 'ISIPV4',
+ 'errmsg'=> 'gateway_error_wrong'),
),
'value' => '',
'width' => '15',
diff --git a/interface/web/admin/form/server_ip.tform.php b/interface/web/admin/form/server_ip.tform.php
index b54a3f1..62851da 100644
--- a/interface/web/admin/form/server_ip.tform.php
+++ b/interface/web/admin/form/server_ip.tform.php
@@ -98,13 +98,10 @@
'ip_address' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'ip_error_empty'),
+ 'validators' => array ( 0 => array ( 'type' => 'ISIPV4',
+ 'errmsg'=> 'ip_error_wrong'),
1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'ip_error_unique'),
- 2 => array ( 'type' => 'REGEX',
- 'regex' => '/^[0-9\.]{7,15}$/',
- 'errmsg'=> 'ip_err'),
),
'default' => '',
'value' => '',
--
Gitblit v1.9.1