fix in the ip address validator and one test

fantu · fantu · commit 0b6b1e4e6499 · 2008-12-20T22:56:12.000Z
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
@@ -632,7 +632,7 @@ function validateField($field_name, $field_value, $validators) {
                                         }
                                 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
@@ -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'		=> '',

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ function validateField($field_name, $field_value, $validators) {`
`632`	`632`	`}`
`633`	`633`	`break;`
`634`	`634`	`case 'ISIPV4':`
`635`		`- if(!preg_match("/^[0-9]{1,3}(.)[0-9]{1,3}(.)[0-9]{1,3}(.)[0-9]{1,3}$/", $field_value)) {`
	`635`	`+ if(!preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)) {`
`636`	`636`	`$errmsg = $validator['errmsg'];`
`637`	`637`	`if(isset($this->wordbook[$errmsg])) {`
`638`	`638`	`$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";`