diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-10-26 10:04:49 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-10-26 10:04:49 +0000 |
| commit | edf199a4f93b92945ef8a0f0a92730e4ec4f378e (patch) | |
| tree | 8b1c5e405d627176f3f1baf03aea1acf96e80473 /frontends/php/include/validate.inc.php | |
| parent | 7460263449bd69345c58bd3414c69fe6d145ce29 (diff) | |
| download | zabbix-edf199a4f93b92945ef8a0f0a92730e4ec4f378e.tar.gz zabbix-edf199a4f93b92945ef8a0f0a92730e4ec4f378e.tar.xz zabbix-edf199a4f93b92945ef8a0f0a92730e4ec4f378e.zip | |
- fixed IP validation
git-svn-id: svn://svn.zabbix.com/trunk@3387 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/validate.inc.php')
| -rw-r--r-- | frontends/php/include/validate.inc.php | 13 |
1 files changed, 7 insertions, 6 deletions
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); |