summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/config.inc.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-10-12 09:16:34 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-10-12 09:16:34 +0000
commitcc3ab52e16eb4c908f69f23b159293df6bac3f23 (patch)
treec5d8acb73eef41594c3b90ec42b43d85f206fcc7 /frontends/php/include/config.inc.php
parent95036b5d466fb31448afc4c429968ee2fe64ba5e (diff)
- [DEV-45][DEV-47] merged rev. 4859:4861,4864:4865 of branches/1.4.j/ (Artem) [changed design of status of Trigger screen, added bulk acknowledge]
git-svn-id: svn://svn.zabbix.com/trunk@4866 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/config.inc.php')
-rw-r--r--frontends/php/include/config.inc.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 1f191b0d..739ab244 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1005,7 +1005,7 @@ function TODO($msg) { echo "TODO: ".$msg.BR; } // DEBUG INFO!!!
# Update configuration
- function update_config($event_history,$alert_history,$refresh_unsupported,$work_period,$alert_usrgrpid)
+ function update_config($event_history,$alert_history,$refresh_unsupported,$work_period,$alert_usrgrpid,$ack_enable,$ack_expire)
{
$update = array();
@@ -1039,6 +1039,14 @@ function TODO($msg) { echo "TODO: ".$msg.BR; } // DEBUG INFO!!!
}
$update[] = 'alert_usrgrpid='.$alert_usrgrpid;
}
+ if(!is_null($ack_enable))
+ {
+ $update[] = 'ack_enable='.$ack_enable;
+ }
+ if(!is_null($ack_expire))
+ {
+ $update[] = 'ack_expire='.$ack_expire;
+ }
if(count($update) == 0)
{
error(S_NOTHING_TO_DO);