- [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

1 files changed, 14 insertions, 9 deletions

diff --git a/frontends/php/config.php b/frontends/php/config.php
index b780242d..04794a19 100644
--- a/frontends/php/config.php
+++ b/frontends/php/config.php
@@ -62,8 +62,9 @@ include_once "include/page_header.php";
 		"delete"=>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	NULL,	NULL),
 		"cancel"=>		array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	NULL,	NULL),
 /* acknowledges */
-		'ack_enable'=>	array(T_ZBX_INT, O_OPT, P_SYS|P_ACT,	IN("0,1"),	'isset({config})&&({config}==8)&&isset({save})'),
-		'ack_expire'=> array(T_ZBX_INT, O_OPT, P_SYS|P_ACT,	BETWEEN(1,65535),	'isset({config})&&({config}==8)&&isset({save})'),
+		'event_ack_enable'=>	array(T_ZBX_INT, O_OPT, P_SYS|P_ACT,	IN("0,1"),	'isset({config})&&({config}==8)&&isset({save})'),
+		'event_expire'=> 		array(T_ZBX_INT, O_OPT, P_SYS|P_ACT,	BETWEEN(1,65535),	'isset({config})&&({config}==8)&&isset({save})'),
+		'event_show_max'=> 		array(T_ZBX_INT, O_OPT, P_SYS|P_ACT,	BETWEEN(1,65535),	'isset({config})&&({config}==8)&&isset({save})'),
 /* other */
 		"form"=>		array(T_ZBX_STR, O_OPT, P_SYS,	NULL,	NULL),
 		"form_refresh"=>	array(T_ZBX_INT, O_OPT,	NULL,	NULL,	NULL)
@@ -137,8 +138,9 @@ include_once "include/page_header.php";
 			get_request('refresh_unsupported'),
 			get_request('work_period'),
 			get_request('alert_usrgrpid'),
-			get_request('ack_enable'),
-			get_request('ack_expire')
+			get_request('event_ack_enable'),
+			get_request('event_expire'),
+			get_request('event_show_max')
 			);
 
 		show_messages($result, S_CONFIGURATION_UPDATED, S_CONFIGURATION_WAS_NOT_UPDATED);
@@ -146,10 +148,12 @@ include_once "include/page_header.php";
 		if($result)
 		{
 			$msg = array();
-			if(!is_null($val = get_request('ack_enable')))
+			if(!is_null($val = get_request('event_ack_enable')))
 				$msg[] = S_EVENT_ACKNOWLEDGES.' ['.($val?(S_DISABLED):(S_ENABLED)).']';
-			if(!is_null($val = get_request('ack_expire')))
+			if(!is_null($val = get_request('event_expire')))
 				$msg[] = S_SHOW_EVENTS_NOT_OLDER.SPACE.'('.S_DAYS.')'.' ['.$val.']';
+			if(!is_null($val = get_request('event_show_max')))
+				$msg[] = S_SHOW_EVENTS_MAX.' ['.$val.']';
 
 			add_audit(AUDIT_ACTION_UPDATE,AUDIT_RESOURCE_ZABBIX_CONFIG,implode('; ',$msg));
 		}		
@@ -167,8 +171,9 @@ include_once "include/page_header.php";
 			get_request('refresh_unsupported'),
 			get_request('work_period'),
 			get_request('alert_usrgrpid'),
-			get_request('ack_enable'),
-			get_request('ack_expire')
+			get_request('event_ack_enable'),
+			get_request('event_expire'),
+			get_request('event_show_max')
 			);
 
 		show_messages($result, S_CONFIGURATION_UPDATED, S_CONFIGURATION_WAS_NOT_UPDATED);
@@ -286,13 +291,13 @@ include_once "include/page_header.php";
 	$form = new CForm("config.php");
 	$form->SetMethod('get');
 	$cmbConfig = new CCombobox("config",$_REQUEST["config"],"submit()");
+	$cmbConfig->AddItem(8,S_EVENTS);
 	$cmbConfig->AddItem(0,S_HOUSEKEEPER);
 //	$cmbConfig->AddItem(2,S_ESCALATION_RULES);
 	$cmbConfig->AddItem(3,S_IMAGES);
 //	$cmbConfig->AddItem(4,S_AUTOREGISTRATION);
 	$cmbConfig->AddItem(6,S_VALUE_MAPPING);
 	$cmbConfig->AddItem(7,S_WORKING_TIME);
-	$cmbConfig->AddItem(8,S_ACKNOWLEDGES);
 	$cmbConfig->AddItem(5,S_OTHER);
 	$form->AddItem($cmbConfig);
 	switch($_REQUEST["config"])