diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-30 08:50:30 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-30 08:50:30 +0000 |
| commit | 57d2c7c6f9ff0b2ea5a5c12bc62f3c0014e7507b (patch) | |
| tree | c7e79e22ecf965eb9bcb24ccc6353e1af3873990 /frontends/php/include | |
| parent | 71a100254b626b45ed75005ac218c3dda1260a8b (diff) | |
ported r3240:3246 ('<=' for trigger severity & '+' for trigger) from 1.1.2
git-svn-id: svn://svn.zabbix.com/trunk@3247 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/actions.inc.php | 4 | ||||
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/defines.inc.php | 1 | ||||
| -rw-r--r-- | frontends/php/include/forms.inc.php | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 55bbe745..f5324558 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -309,6 +309,10 @@ { $op=">="; } + else if($operator == CONDITION_OPERATOR_LESS_EQUAL) + { + $op="<="; + } $desc=S_UNKNOWN; if($conditiontype==CONDITION_TYPE_GROUP) diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index d85519cf..9867d801 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -676,7 +676,7 @@ document.writeln(snd_tag); // if (eregi('^\{([0-9a-zA-Z[.-.]\_\.]+)\:([]\[0-9a-zA-Z\_\/\.\,]+)\.((diff)|(min)|(max)|(last)|(prev))\(([0-9\.]+)\)\}$', $expression, $arr)) // if (eregi('^\{([0-9a-zA-Z[.-.]\_\.]+)\:([]\[0-9a-zA-Z\_\/\.\,]+)\.((diff)|(min)|(max)|(last)|(prev)|(str))\(([0-9a-zA-Z\.\_\/\,]+)\)\}$', $expression, $arr)) // if (eregi('^\{([0-9a-zA-Z\_\.-]+)\:([]\[0-9a-zA-Z\_\*\/\.\,\:\(\) -]+)\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,]+)\)\}$', $expression, $arr)) - if (eregi('^\{([0-9a-zA-Z\_\.-]+)\:([]\[0-9a-zA-Z\_\*\/\.\,\:\(\) -]+)\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,[:space:]]+)\)\}$', $expression, $arr)) + if (eregi('^\{([0-9a-zA-Z\_\.-]+)\:([]\[0-9a-zA-Z\_\*\/\.\,\:\(\)\+ -]+)\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,[:space:]]+)\)\}$', $expression, $arr)) { $host=$arr[1]; $key=$arr[2]; diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index 11b805e6..b02009e7 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -72,6 +72,7 @@ define("CONDITION_OPERATOR_NOT_LIKE", 3); define("CONDITION_OPERATOR_IN", 4); define("CONDITION_OPERATOR_MORE_EQUAL", 5); + define("CONDITION_OPERATOR_LESS_EQUAL", 6); define("HOST_STATUS_MONITORED", 0); define("HOST_STATUS_NOT_MONITORED", 1); diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index e2ea1e11..14230e9b 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -1339,6 +1339,8 @@ $cmbCondOp->AddItem(CONDITION_OPERATOR_IN, 'in'); if(in_array($new_condition_type,array(CONDITION_TYPE_TRIGGER_SEVERITY))) $cmbCondOp->AddItem(CONDITION_OPERATOR_MORE_EQUAL, '>='); + if(in_array($new_condition_type,array(CONDITION_TYPE_TRIGGER_SEVERITY))) + $cmbCondOp->AddItem(CONDITION_OPERATOR_LESS_EQUAL, '<='); array_push($rowCondition,$cmbCondOp); |