diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-17 12:15:57 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-17 12:15:57 +0000 |
| commit | 706df4a919a955a760068d390ea2d9114ae78aef (patch) | |
| tree | 84fbae859ca90f755ff560d1521195403a4fa372 /frontends | |
| parent | 8ced5b907fe6b4bf651a2fef63b344277947e836 (diff) | |
| download | zabbix-706df4a919a955a760068d390ea2d9114ae78aef.tar.gz zabbix-706df4a919a955a760068d390ea2d9114ae78aef.tar.xz zabbix-706df4a919a955a760068d390ea2d9114ae78aef.zip | |
- fixed frontend to accept trigger function time() (Alexei)
[svn merge -r4604:4607 svn://svn.zabbix.com/branches/1.4.2]
git-svn-id: svn://svn.zabbix.com/trunk@4608 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/php/include/triggers.inc.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php index 6b5cd5c5..22821f5d 100644 --- a/frontends/php/include/triggers.inc.php +++ b/frontends/php/include/triggers.inc.php @@ -101,6 +101,12 @@ ITEM_VALUE_TYPE_UINT64 ) ); + $ZBX_TR_EXPR_ALLOWED_FUNCTIONS['iregexp']= array('args' => array( 0 => array('type' => 'str','mandat' => true) ), + 'item_types' => array( + ITEM_VALUE_TYPE_STR, + ITEM_VALUE_TYPE_LOG + ) + ); $ZBX_TR_EXPR_ALLOWED_FUNCTIONS['last'] = array('args' => null, 'item_types' => array( ITEM_VALUE_TYPE_FLOAT, @@ -162,12 +168,7 @@ ITEM_VALUE_TYPE_LOG ) ); - $ZBX_TR_EXPR_ALLOWED_FUNCTIONS['iregexp']= array('args' => array( 0 => array('type' => 'str','mandat' => true) ), - 'item_types' => array( - ITEM_VALUE_TYPE_STR, - ITEM_VALUE_TYPE_LOG - ) - ); + $ZBX_TR_EXPR_ALLOWED_FUNCTIONS['time'] = array('args' => null, 'item_types' => null ); } INIT_TRIGGER_EXPRESSION_STRUCTURES(); |