diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-04 08:42:31 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-04 08:42:31 +0000 |
| commit | 621b3e8d4771f21e4ac620f957abdb5dc8573fd6 (patch) | |
| tree | 7c715328526416ca76f7ef73ba5a7748cc51f69f /frontends/php/include | |
| parent | acf3d2d5e9493430c187af9dc673bf5fcf438593 (diff) | |
| download | zabbix-621b3e8d4771f21e4ac620f957abdb5dc8573fd6.tar.gz zabbix-621b3e8d4771f21e4ac620f957abdb5dc8573fd6.tar.xz zabbix-621b3e8d4771f21e4ac620f957abdb5dc8573fd6.zip | |
- added support of NOT IN operator for time periods (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@4423 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/actions.inc.php | 10 | ||||
| -rw-r--r-- | frontends/php/include/defines.inc.php | 1 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 9b872a85..f8e90ab1 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -298,11 +298,12 @@ include_once 'include/discovery.inc.php'; { $str_op[CONDITION_OPERATOR_EQUAL] = '='; $str_op[CONDITION_OPERATOR_NOT_EQUAL] = '<>'; - $str_op[CONDITION_OPERATOR_LIKE] = 'like'; - $str_op[CONDITION_OPERATOR_NOT_LIKE] = 'not like'; - $str_op[CONDITION_OPERATOR_IN] = 'in'; + $str_op[CONDITION_OPERATOR_LIKE] = S_LIKE_SMALL; + $str_op[CONDITION_OPERATOR_NOT_LIKE] = S_NOT_LIKE_SMALL; + $str_op[CONDITION_OPERATOR_IN] = S_IN_SMALL; $str_op[CONDITION_OPERATOR_MORE_EQUAL] = '>='; $str_op[CONDITION_OPERATOR_LESS_EQUAL] = '<='; + $str_op[CONDITION_OPERATOR_NOT_IN] = S_NOT_IN_SMALL; if(isset($str_op[$operator])) return $str_op[$operator]; @@ -558,7 +559,8 @@ include_once 'include/discovery.inc.php'; CONDITION_OPERATOR_EQUAL ); $operators[CONDITION_TYPE_TIME_PERIOD] = array( - CONDITION_OPERATOR_IN + CONDITION_OPERATOR_IN, + CONDITION_OPERATOR_NOT_IN ); $operators[CONDITION_TYPE_DHOST_IP] = array( CONDITION_OPERATOR_EQUAL, diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index e709a73a..59043c76 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -126,6 +126,7 @@ define('CONDITION_OPERATOR_IN', 4); define('CONDITION_OPERATOR_MORE_EQUAL', 5); define('CONDITION_OPERATOR_LESS_EQUAL', 6); + define('CONDITION_OPERATOR_NOT_IN', 7); define('HOST_STATUS_MONITORED', 0); define('HOST_STATUS_NOT_MONITORED', 1); diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 6a2c4c51..d2bae0f1 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -288,6 +288,10 @@ 'S_ENABLE_SELECTED_ACTIONS_Q'=> 'Enable selected actions?', 'S_DISABLE_SELECTED_ACTIONS_Q'=> 'Disable selected actions?', 'S_DELETE_SELECTED_ACTION_Q'=> 'Delete selected action?', + 'S_LIKE_SMALL'=> 'like', + 'S_NOT_LIKE_SMALL'=> 'not like', + 'S_IN_SMALL'=> 'in', + 'S_NOT_IN_SMALL'=> 'not in', // alarms.php 'S_ALARMS'=> 'Alarms', |