From 0b6b1e4e64995187662e81e37f75fa8eb7a934d1 Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Sat, 20 Dec 2008 17:56:12 -0500
Subject: [PATCH] fix in the ip address validator and one test
---
interface/lib/classes/tform.inc.php | 2 +-
interface/web/admin/form/server_config.tform.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index d2d0e5d..813ff80 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -632,7 +632,7 @@
}
break;
case 'ISIPV4':
- if(!preg_match("/^[0-9]{1,3}(.)[0-9]{1,3}(.)[0-9]{1,3}(.)[0-9]{1,3}$/", $field_value)) {
+ if(!preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)) {
$errmsg = $validator['errmsg'];
if(isset($this->wordbook[$errmsg])) {
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index a40e47a..eb47589 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -68,7 +68,7 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '192.168.0.105',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+ 'validators' => array ( 0 => array ( 'type' => 'ISIPV4',
'errmsg'=> 'ip_address_error_empty'),
),
'value' => '',
--
Gitblit v1.9.1