diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-12-27 18:34:39 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-12-27 18:34:39 +0000 |
| commit | 09554d562e4d076bc5d1178d6e6f13eeae5f8f02 (patch) | |
| tree | 84fdb3a34554543eb9154c8cbd9d653e1ca429f2 /frontends/php/include | |
| parent | 461bb2a4ff683a38e6b2066f8c3fec67e110e44a (diff) | |
| download | zabbix-09554d562e4d076bc5d1178d6e6f13eeae5f8f02.tar.gz zabbix-09554d562e4d076bc5d1178d6e6f13eeae5f8f02.tar.xz zabbix-09554d562e4d076bc5d1178d6e6f13eeae5f8f02.zip | |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2434 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/actions.inc.php | 7 | ||||
| -rw-r--r-- | frontends/php/include/forms.inc.php | 8 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 3364467f..76b60da6 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -314,6 +314,13 @@ { $desc=S_TRIGGER_DESCRIPTION." $op "."\"".$value."\""; } + else if($conditiontype==CONDITION_TYPE_TRIGGER_VALUE) + { + if($value==0) + $desc=S_TRIGGER_VALUE." $op "."\"OFF\""; + if($value==1) + $desc=S_TRIGGER_VALUE." $op "."\"ON\""; + } else if($conditiontype==CONDITION_TYPE_TRIGGER_SEVERITY) { $desc=S_TRIGGER_SEVERITY." $op "."\"".get_severity_description($value)."\""; diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index 3e046467..04300378 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -1626,7 +1626,7 @@ $h2=$h2."<select class=\"biginput\" name=\"operator\">"; if(in_array($conditiontype,array(CONDITION_TYPE_GROUP, CONDITION_TYPE_HOST,CONDITION_TYPE_TRIGGER,CONDITION_TYPE_TRIGGER_SEVERITY,CONDITION_TYPE_TRIGGER_VALUE))) $h2=$h2.form_select("operator",CONDITION_OPERATOR_EQUAL,"="); - if(in_array($conditiontype,array(CONDITION_TYPE_GROUP, CONDITION_TYPE_HOST,CONDITION_TYPE_TRIGGER,CONDITION_TYPE_TRIGGER_SEVERITY,CONDITION_TYPE_TRIGGER_VALUE))) + if(in_array($conditiontype,array(CONDITION_TYPE_GROUP, CONDITION_TYPE_HOST,CONDITION_TYPE_TRIGGER,CONDITION_TYPE_TRIGGER_SEVERITY))) $h2=$h2.form_select("operator",CONDITION_OPERATOR_NOT_EQUAL,"<>"); if(in_array($conditiontype,array(CONDITION_TYPE_TRIGGER_NAME))) $h2=$h2.form_select("operator",CONDITION_OPERATOR_LIKE,"like"); @@ -1634,7 +1634,7 @@ $h2=$h2.form_select("operator",CONDITION_OPERATOR_NOT_LIKE,"not like"); if(in_array($conditiontype,array(CONDITION_TYPE_TIME_PERIOD))) $h2=$h2.form_select("operator",CONDITION_OPERATOR_IN,"in"); - if(in_array($conditiontype,array(CONDITION_TYPE_TRIGGER_VALUE))) + if(in_array($conditiontype,array(CONDITION_TYPE_TRIGGER_SEVERITY))) $h2=$h2.form_select("operator",CONDITION_OPERATOR_MORE_EQUAL,">="); $h2=$h2."</SELECT>"; // echo $h2; @@ -1661,8 +1661,8 @@ else if($conditiontype == CONDITION_TYPE_TRIGGER_VALUE) { $h2=$h2."<select class=\"biginput\" name=\"value\">"; - $h2=$h2.form_select("value",0,"ON"); - $h2=$h2.form_select("value",1,"OFF"); + $h2=$h2.form_select("value",0,"OFF"); + $h2=$h2.form_select("value",1,"ON"); $h2=$h2."</SELECT>"; } else if($conditiontype == CONDITION_TYPE_TIME_PERIOD) diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 8ec6c13f..0ecdb074 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -62,6 +62,7 @@ "S_TRIGGER_VALUE"=> "Trigger value", "S_TIME_PERIOD"=> "Time period", "S_TRIGGER_DESCRIPTION"=> "Trigger description", + "S_CONDITIONS"=> "Conditions", // actions.php "S_ACTIONS"=> "Actions", |