diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-25 08:59:24 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-25 08:59:24 +0000 |
| commit | 3caf8639ef40a9cbb42c9dad28e1324d3dff17ed (patch) | |
| tree | 2ecab7c53e7ed4339c49d21eb804cccdffa7457a /frontends/php/actionconf.php | |
| parent | a4abbb8aafb7da9f50fa8716954a43a3961a9082 (diff) | |
| download | zabbix-3caf8639ef40a9cbb42c9dad28e1324d3dff17ed.tar.gz zabbix-3caf8639ef40a9cbb42c9dad28e1324d3dff17ed.tar.xz zabbix-3caf8639ef40a9cbb42c9dad28e1324d3dff17ed.zip | |
- dropped suport of delays between actions due to bad design (Alexei)
- fixed incorrect handling of actions (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2904 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/actionconf.php')
| -rw-r--r-- | frontends/php/actionconf.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/frontends/php/actionconf.php b/frontends/php/actionconf.php index acf4fc8b..afc9a1a6 100644 --- a/frontends/php/actionconf.php +++ b/frontends/php/actionconf.php @@ -47,7 +47,7 @@ "source"=> array(T_ZBX_INT, O_OPT, NULL, IN("0"), 'isset({save})'), "recipient"=> array(T_ZBX_INT, O_OPT, NULL, IN("0,1"), 'isset({save})'), "userid"=> array(T_ZBX_INT, O_OPT, NULL, DB_ID, 'isset({save})'), - "delay"=> array(T_ZBX_INT, O_OPT, NULL, BETWEEN(0,65535),'isset({save})'), +/* "delay"=> array(T_ZBX_INT, O_OPT, NULL, BETWEEN(0,65535),'isset({save})'),*/ "subject"=> array(T_ZBX_STR, O_OPT, NULL, NOT_EMPTY, '{actiontype}==0&&isset({save})'), "message"=> array(T_ZBX_STR, O_OPT, NULL, NOT_EMPTY, '{actiontype}==0&&isset({save})'), "scripts"=> array(T_ZBX_STR, O_OPT, NULL, NOT_EMPTY, '{actiontype}==1&&isset({save})'), @@ -108,7 +108,7 @@ { $actionid=$_REQUEST["actionid"]; $result = update_action($actionid, - $_REQUEST['actiontype'],$_REQUEST['userid'],$_REQUEST["delay"], + $_REQUEST['actiontype'],$_REQUEST['userid'], $_REQUEST["subject"], $_REQUEST["message"],$_REQUEST["recipient"], $_REQUEST["maxrepeats"],$_REQUEST["repeatdelay"],$_REQUEST["status"], $_REQUEST["scripts"]); @@ -116,7 +116,7 @@ show_messages($result,S_ACTION_UPDATED,S_CANNOT_UPDATE_ACTION); } else { $actionid=add_action( - $_REQUEST['actiontype'],$_REQUEST['userid'],$_REQUEST["delay"], + $_REQUEST['actiontype'],$_REQUEST['userid'], $_REQUEST["subject"],$_REQUEST["message"],$_REQUEST["recipient"], $_REQUEST["maxrepeats"],$_REQUEST["repeatdelay"],$_REQUEST["status"], $_REQUEST["scripts"]); @@ -246,7 +246,6 @@ ), S_CONDITIONS, $_REQUEST["actiontype"] == ACTION_TYPE_MESSAGE ? S_SEND_MESSAGE_TO : S_REMOTE_COMMAND, - S_DELAY, $_REQUEST["actiontype"] == ACTION_TYPE_MESSAGE ? S_SUBJECT : NULL, S_REPEATS, S_STATUS)); @@ -310,7 +309,6 @@ ), $conditions, $recipient, - htmlspecialchars($row["delay"]), $subject, $row["maxrepeats"] == 0 ? S_NO_REPEATS : $row["maxrepeats"], $status |