diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-24 13:19:23 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-24 13:19:23 +0000 |
| commit | 3c52f48374f9691e355fe71981a051c702ba5316 (patch) | |
| tree | b4306aea2eda001e3531f4eb87553e3a00f6d5ed /frontends/php/include | |
| parent | 01ba45a0339faf0e7efb7a244ec33220957806a1 (diff) | |
- fixed trigges expression validation for non float functions (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@4173 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/triggers.inc.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php index f4834750..61c60c86 100644 --- a/frontends/php/include/triggers.inc.php +++ b/frontends/php/include/triggers.inc.php @@ -191,10 +191,10 @@ $allowed_functions['date'] = 'float'; $allowed_functions['now'] = 'float'; $allowed_functions['fuzzytime'] = 'float'; - $allowed_functions['str'] = true; - $allowed_functions['logseverity'] = true; - $allowed_functions['logsource'] = true; - $allowed_functions['regexp'] = true; + $allowed_functions['str'] = ''; + $allowed_functions['logseverity'] = ''; + $allowed_functions['logsource'] = ''; + $allowed_functions['regexp'] = ''; // echo "Validating simple:$expression<br>"; if (eregi(ZBX_EREG_SIMPLE_EXPRESSION_FORMAT, $expression, $arr)) @@ -240,7 +240,6 @@ return -1; } - if( 'float' == $allowed_functions[$function] && (validate_float($parameter)!=0) ) { |