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

3 files changed, 19 insertions, 10 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)
 		{
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index f4858ddd..484fad75 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -4064,19 +4064,22 @@ include_once 'include/discovery.inc.php';
 	{
 		$config=select_config();
 		
-		$frmEventAck = new CFormTable(S_ACKNOWLEDGES,"config.php");
+		$frmEventAck = new CFormTable(S_EVENTS,"config.php");
 //		$frmEventAck->SetHelp("web.config.workperiod.php");
 		$frmEventAck->AddVar("config",get_request("config",8));
 
-		$exp_select = new CComboBox('ack_enable');
+		$exp_select = new CComboBox('event_ack_enable');
 
-		$exp_select->AddItem(EVENT_ACK_ENABLED,S_ENABLED,$config['ack_enable']?'yes':'no');
-		$exp_select->AddItem(EVENT_ACK_DISABLED,S_DISABLED,$config['ack_enable']?'no':'yes');
+		$exp_select->AddItem(EVENT_ACK_ENABLED,S_ENABLED,$config['event_ack_enable']?'yes':'no');
+		$exp_select->AddItem(EVENT_ACK_DISABLED,S_DISABLED,$config['event_ack_enable']?'no':'yes');
 
 		$frmEventAck->AddRow(S_EVENT_ACKNOWLEDGES,$exp_select);
 			
 		$frmEventAck->AddRow(S_SHOW_EVENTS_NOT_OLDER.SPACE.'('.S_DAYS.')',
-			new CTextBox('ack_expire',$config['ack_expire'],5));
+			new CTextBox('event_expire',$config['event_expire'],5));
+
+		$frmEventAck->AddRow(S_MAX_COUNT_OF_EVENTS,
+			new CTextBox('event_show_max',$config['event_show_max'],5));
 
 		$frmEventAck->AddItemToBottomRow(new CButton("save",S_SAVE));
 		$frmEventAck->Show();
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 2580568f..145dd274 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -374,6 +374,8 @@
 	'S_EVENT_ACKNOWLEDGES'=>		'Event acknowledges',
 	'S_DAYS'=>						'Days',
 	'S_SHOW_EVENTS_NOT_OLDER'=>			'Show events not older',
+	'S_SHOW_EVENTS_MAX'=>			'Show events max',
+	'S_MAX_COUNT_OF_EVENTS'=>		'Max count of events per trigger to show',
 	'S_CANNNOT_UPDATE_VALUE_MAP'=>		'Cannot update value map',
 	'S_VALUE_MAP_ADDED'=>			'Value map added',
 	'S_CANNNOT_ADD_VALUE_MAP'=>		'Cannot add value map',