summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/config.inc.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-21 14:17:43 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-21 14:17:43 +0000
commite46ef00fc9b5b1636e2428bf7ef4201e81420e14 (patch)
tree4cdbe9a9f64efd480f7fe21668d0f7ec8b2dfe12 /frontends/php/include/config.inc.php
parent5df2ecce7fdd320a56d91cf07abfd21d4c15ac50 (diff)
- [DEV-45] merged rev. 5079:5083 of branches/1.4.j/ (Artem) [changes in configuration of events, DB changes: [config.ack_enable -> config.event_ack_enable; config.ack_expire -> config.event_expire;], added new field: [config.event_show_max]]
git-svn-id: svn://svn.zabbix.com/trunk@5084 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/config.inc.php')
-rw-r--r--frontends/php/include/config.inc.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 0d339385..52d69e90 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1006,7 +1006,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,$ack_enable,$ack_expire)
+ function update_config($event_history,$alert_history,$refresh_unsupported,$work_period,$alert_usrgrpid,$event_ack_enable,$event_expire,$event_show_max)
{
$update = array();
@@ -1040,13 +1040,17 @@ function TODO($msg) { echo "TODO: ".$msg.BR; } // DEBUG INFO!!!
}
$update[] = 'alert_usrgrpid='.$alert_usrgrpid;
}
- if(!is_null($ack_enable))
+ if(!is_null($event_ack_enable))
{
- $update[] = 'ack_enable='.$ack_enable;
+ $update[] = 'event_ack_enable='.$event_ack_enable;
}
- if(!is_null($ack_expire))
+ if(!is_null($event_expire))
{
- $update[] = 'ack_expire='.$ack_expire;
+ $update[] = 'event_expire='.$event_expire;
+ }
+ if(!is_null($event_show_max))
+ {
+ $update[] = 'event_show_max='.$event_show_max;
}
if(count($update) == 0)
{