diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-01-02 08:15:39 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-01-02 08:15:39 +0000 |
| commit | 6d536e136ac68af7741c2a7f0d6a55baec7ef67a (patch) | |
| tree | 65e62a97cd1dbb45dbd21e8eb29b8a84e4315121 /frontends/php/include | |
| parent | 2a9fc3a4279034b3770c2e29ff404d601c7730e9 (diff) | |
| download | zabbix-6d536e136ac68af7741c2a7f0d6a55baec7ef67a.tar.gz zabbix-6d536e136ac68af7741c2a7f0d6a55baec7ef67a.tar.xz zabbix-6d536e136ac68af7741c2a7f0d6a55baec7ef67a.zip | |
- new trigger function: regexp (Alexei)
- support of function str() for item type 'log' (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2469 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/config.inc.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 9c28443a..b26ca7ea 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -780,14 +780,17 @@ function SDI($msg) { echo "DEBUG INFO: $msg <br>"; } # DEBUG INFO!!! ($function!="dayofweek")&& ($function!="date")&& ($function!="now")&& - ($function!="str")) + ($function!="str")&& + ($function!="fuzzytime")&& + ($function!="regexp") + ) { error("Unknown function [$function]"); return -1; } - if(( $function!="str") && (validate_float($parameter)!=0) ) + if(( $function!="str") && ( $function!="regexp") && (validate_float($parameter)!=0) ) { error("[$parameter] is not a float"); return -1; |