diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-08 11:59:15 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-08 11:59:15 +0000 |
| commit | f99327ef29f466bac40fdd47413d1a9cab9b3690 (patch) | |
| tree | 48748ced776efb2490b7c382dcfb7c002ffb2130 /frontends/php/include/validate.inc.php | |
| parent | 09174fc6e94e7ff57d3d1e9f8dd134be4d7645c7 (diff) | |
| download | zabbix-f99327ef29f466bac40fdd47413d1a9cab9b3690.tar.gz zabbix-f99327ef29f466bac40fdd47413d1a9cab9b3690.tar.xz zabbix-f99327ef29f466bac40fdd47413d1a9cab9b3690.zip | |
- [DEV-50] merged rev. 4841:4843 of branches/1.4/ (Artem) [improved incoming parameters exception validation]
git-svn-id: svn://svn.zabbix.com/trunk@4847 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/validate.inc.php')
| -rw-r--r-- | frontends/php/include/validate.inc.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/frontends/php/include/validate.inc.php b/frontends/php/include/validate.inc.php index db0e1291..46a03a1f 100644 --- a/frontends/php/include/validate.inc.php +++ b/frontends/php/include/validate.inc.php @@ -207,12 +207,15 @@ { foreach($fields as $f => $checks) { +/* // If an unset variable used in expression, return FALSE if(strstr($expression,'{'.$f.'}')&&!isset($_REQUEST[$f])) { +//SDI("Variable [$f] is not set. $expression is FALSE"); //info("Variable [$f] is not set. $expression is FALSE"); - return FALSE; +// return FALSE; } +//*/ //echo $f,":",$expression,"<br>"; $expression = str_replace('{'.$f.'}','$_REQUEST["'.$f.'"]',$expression); //$debug .= $f." = ".$_REQUEST[$f].BR; @@ -223,6 +226,7 @@ $ret = eval($exec); //echo $debug; //echo "$field - result: ".$ret." exec: $exec".BR.BR; +//SDI("$field - result: ".$ret." exec: $exec"); return $ret; } @@ -230,7 +234,7 @@ { global $_REQUEST; -//echo "$field - expression: ".$expression.BR; +//SDI("$field - expression: ".$expression); if(strstr($expression,"{}") && !isset($_REQUEST[$field])) return FALSE; @@ -248,7 +252,7 @@ } return TRUE; } - +//SDI("$field - expression: ".$expression); return calc_exp2($fields,$field,$expression); } |