From edf199a4f93b92945ef8a0f0a92730e4ec4f378e Mon Sep 17 00:00:00 2001
From: osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>
Date: Thu, 26 Oct 2006 10:04:49 +0000
Subject:  - fixed IP validation

git-svn-id: svn://svn.zabbix.com/trunk@3387 97f52cf1-0a1b-0410-bd0e-c28be96e8082
---
 frontends/php/include/validate.inc.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'frontends/php/include/validate.inc.php')

diff --git a/frontends/php/include/validate.inc.php b/frontends/php/include/validate.inc.php
index 2489c52a..b054e8ac 100644
--- a/frontends/php/include/validate.inc.php
+++ b/frontends/php/include/validate.inc.php
@@ -163,7 +163,7 @@
 		if($type == T_ZBX_IP)
 		{
 			if(!is_array($var)) $var = explode('.',$var);
-			if(!isset($var[0]) || !isset($var[1]) || !isset($var[2]) || !isset($var[3]))
+			if(count($var) != 4)
 			{
 				if($flags&P_SYS)
 				{
@@ -317,12 +317,8 @@
 				}
 			}
 		}
-		
-		if($type == T_ZBX_IP)
-		{
-			$_REQUEST[$field] = implode('.', $_REQUEST[$field]);
-		}
 
+		
 		return ZBX_VALID_OK;
 	}
 
@@ -353,6 +349,11 @@
 		foreach($fields as $field => $checks)
 		{
 			$err |= check_field($fields, $field,$checks);
+			
+			if($checks[0] == T_ZBX_IP && isset($_REQUEST[$field]))
+			{
+				$_REQUEST[$field] = implode('.', $_REQUEST[$field]);
+			}
 		}
 
 		unset_not_in_list($fields);
-- 
cgit