diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-03-06 15:34:26 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-03-06 15:34:26 +0000 |
| commit | 07a5506c23fdad41781a7a9458c8bb5748f1619d (patch) | |
| tree | 609701e4abe6020ef7d971d07a37a51bc5930d98 /frontends/php/actionconf.php | |
| parent | fa076fa0fb007a382ab291a16a6645d4fb9e583c (diff) | |
| download | zabbix-07a5506c23fdad41781a7a9458c8bb5748f1619d.tar.gz zabbix-07a5506c23fdad41781a7a9458c8bb5748f1619d.tar.xz zabbix-07a5506c23fdad41781a7a9458c8bb5748f1619d.zip | |
added support of AND, OR, AND/OR calculation of action conditions [GUI] (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3876 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/actionconf.php')
| -rw-r--r-- | frontends/php/actionconf.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/frontends/php/actionconf.php b/frontends/php/actionconf.php index 772b2b10..4e7395a0 100644 --- a/frontends/php/actionconf.php +++ b/frontends/php/actionconf.php @@ -49,6 +49,7 @@ include_once "include/page_header.php"; "scripts"=> array(T_ZBX_STR, O_OPT, NULL, NOT_EMPTY, '{actiontype}==1&&isset({save})'), "repeat"=> array(T_ZBX_INT, O_OPT, NULL, IN("0,1"), 'isset({save})'), "status"=> array(T_ZBX_INT, O_OPT, NULL, IN("0,1"), 'isset({save})'), + "evaltype"=> array(T_ZBX_INT, O_OPT, NULL, IN(ACTION_EVAL_TYPE_AND_OR.','.ACTION_EVAL_TYPE_AND.','.ACTION_EVAL_TYPE_OR), 'isset({save})'), "maxrepeats"=> array(T_ZBX_INT, O_OPT, NULL, BETWEEN(0,65535),'{repeat}==1&&isset({save})'), "repeatdelay"=> array(T_ZBX_INT, O_OPT, NULL, BETWEEN(0,65535),'{repeat}==1&&isset({save})'), @@ -116,7 +117,7 @@ include_once "include/page_header.php"; $_REQUEST['actiontype'],$_REQUEST['userid'], $_REQUEST["subject"], $_REQUEST["message"],$_REQUEST["recipient"], $_REQUEST["maxrepeats"],$_REQUEST["repeatdelay"],$_REQUEST["status"], - $_REQUEST["scripts"]); + $_REQUEST["scripts"],$_REQUEST["evaltype"]); show_messages($result,S_ACTION_UPDATED,S_CANNOT_UPDATE_ACTION); } else { @@ -127,7 +128,7 @@ include_once "include/page_header.php"; $_REQUEST['actiontype'],$_REQUEST['userid'], $_REQUEST["subject"],$_REQUEST["message"],$_REQUEST["recipient"], $_REQUEST["maxrepeats"],$_REQUEST["repeatdelay"],$_REQUEST["status"], - $_REQUEST["scripts"]); + $_REQUEST["scripts"],$_REQUEST["evaltype"]); $result=$actionid; show_messages($result,S_ACTION_ADDED,S_CANNOT_ADD_ACTION); |