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

5 files changed, 123 insertions, 44 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);
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 8360dd51..733362ea 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -199,12 +199,25 @@
 	define('SERVICE_ALGORITHM_NONE',0);
 	define('SERVICE_ALGORITHM_MAX',1);
 	define('SERVICE_ALGORITHM_MIN',2);
+	
+	define('TRIGGER_MULT_EVENT_DISABLED',0);
+	define('TRIGGER_MULT_EVENT_ENABLED',1);
+	
+	define('TRIGGER_STATUS_ENABLED',0);
+	define('TRIGGER_STATUS_DISABLED',1);
+	define('TRIGGER_STATUS_UNKNOWN',2);
+	
+	define('TRIGGERS_OPTION_DISABLED',		0);	// reserved
+	define('TRIGGERS_OPTION_ONLYTRUE',		1);	// use 0 to disable
+	define('TRIGGERS_OPTION_ALL',			2);	// use 0 to disable
+	define('TRIGGERS_OPTION_NOFALSEFORB',	0);	// use 0 to disable
 
 	define('TRIGGER_VALUE_FALSE',0);
 	define('TRIGGER_VALUE_TRUE',1);
 	define('TRIGGER_VALUE_UNKNOWN',2);
-	
-	define('TRIGGER_BLINK_PERIOD',1800);
+
+	define('TRIGGER_FALSE_PERIOD', 			1800);	
+	define('TRIGGER_BLINK_PERIOD',			1800);
 
 	define('TRIGGER_SEVERITY_NOT_CLASSIFIED',	0);
 	define('TRIGGER_SEVERITY_INFORMATION',		1);
@@ -212,7 +225,7 @@
 	define('TRIGGER_SEVERITY_AVERAGE',		3);
 	define('TRIGGER_SEVERITY_HIGH',			4);
 	define('TRIGGER_SEVERITY_DISASTER',		5);
-
+	
 	define('ALERT_STATUS_NOT_SENT',0);
 	define('ALERT_STATUS_SENT',1);
 
@@ -237,10 +250,6 @@
 	define('ACTION_EVAL_TYPE_AND',1);
 	define('ACTION_EVAL_TYPE_OR',2);
 
-	define('TRIGGER_STATUS_ENABLED',0);
-	define('TRIGGER_STATUS_DISABLED',1);
-	define('TRIGGER_STATUS_UNKNOWN',2);
-
 	define('OPERATION_OBJECT_USER',		0);
 	define('OPERATION_OBJECT_GROUP',	1);
 
@@ -355,12 +364,22 @@
 	define('HTTPSTEP_ITEM_TYPE_IN',		2);
 	define('HTTPSTEP_ITEM_TYPE_LASTSTEP',	3);
 
+	define('EVENT_ACK_DISABLED','0');
+	define('EVENT_ACK_ENABLED','1');
+
 	define('EVENT_SOURCE_TRIGGERS',		0);
 	define('EVENT_SOURCE_DISCOVERY',	1);
 
 	define('EVENT_OBJECT_TRIGGER',		0);
 	define('EVENT_OBJECT_DHOST',		1);
 	define('EVENT_OBJECT_DSERVICE',		2);
+	
+	define('EVENTS_OPTION_DISABLED',		0);		//	reserved
+	define('EVENTS_OPTION_NOEVENT',			1);		//	use 0 to disable
+	define('EVENTS_OPTION_ALL',				2);		//	use 0 to disable
+	define('EVENTS_OPTION_NOT_ACK',			3);		//	use 0 to disable
+	define('EVENTS_OPTION_ONLYTRUE_NOTACK',	4);		//	use 0 to disable
+	define('EVENTS_OPTION_NOFALSEFORB',		5);		//  reserved for TRIGGERS_OPTION_NOFALSEFORB, to disable set TRIGGERS_OPTION_NOFALSEFORB to 0
 
 	define('DOBJECT_STATUS_UP',	0);
 	define('DOBJECT_STATUS_DOWN',	1);
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 2e010c9d..a05f2da4 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -637,13 +637,16 @@
 		$frmNode->Show();
 	}
 	
-	function	insert_new_message_form()
+	function insert_new_message_form($events,$bulk)
 	{
 		global $USER_DETAILS;
 		global $_REQUEST;
-
-		$db_acks = get_acknowledges_by_eventid($_REQUEST["eventid"]);
-		if(!DBfetch($db_acks))
+	
+		if($bulk){
+			$title = S_ACKNOWLEDGE_ALARM_BY;
+			$btn_txt2 = S_ACKNOWLEDGE.' '.S_AND_SYMB.' '.S_RETURN;			
+		}
+		else if(!DBfetch(get_acknowledges_by_eventid(get_request('eventid',0))))
 		{
 			$title = S_ACKNOWLEDGE_ALARM_BY;
 			$btn_txt = S_ACKNOWLEDGE;
@@ -658,17 +661,22 @@
 
 		$frmMsg= new CFormTable($title." \"".$USER_DETAILS["alias"]."\"");
 		$frmMsg->SetHelp("manual.php");
-		$frmMsg->AddVar("eventid",get_request("eventid",0));
+
+		if($bulk) $frmMsg->AddVar('bulkacknowledge',1);
+		
+		foreach($events as $id => $eventid){
+			$frmMsg->AddVar('events['.$eventid.']',$eventid);
+		}
 
 		$frmMsg->AddRow(S_MESSAGE, new CTextArea("message","",80,6));
 
 		$frmMsg->AddItemToBottomRow(new CButton("saveandreturn",$btn_txt2));
-		$frmMsg->AddItemToBottomRow(new CButton("save",$btn_txt));
+		(isset($btn_txt))?($frmMsg->AddItemToBottomRow(new CButton("save",$btn_txt))):('');
 		$frmMsg->AddItemToBottomRow(new CButtonCancel(url_param('eventid')));
 
 		$frmMsg->Show(false);
 
-		SetFocus($frmMsg->GetName(),"message");
+		SetFocus($frmMsg->GetName(),'message');
 
 		$frmMsg->Destroy();
 	}
@@ -2255,6 +2263,7 @@
 
 		$expression	= get_request("expression"	,"");
 		$description	= get_request("description"	,"");
+		$type = get_request('type', 0);
 		$priority	= get_request("priority"	,0);
 		$status		= get_request("status"		,0);
 		$comments	= get_request("comments"	,"");
@@ -2267,6 +2276,7 @@
 
 			if(!isset($limited) || !isset($_REQUEST["form_refresh"]))
 			{
+				$type = $trigger['type'];
 				$priority	= $trigger["priority"];
 				$status		= $trigger["status"];
 				$comments	= $trigger["comments"];
@@ -2326,7 +2336,11 @@
 			new CButton("add_dependence",S_ADD)
 			),'new');
 			
-	/* end new dwpendence */
+		$type_select = new CComboBox('type');
+		$type_select->Additem(TRIGGER_MULT_EVENT_DISABLED,S_NORMAL,(($type == TRIGGER_MULT_EVENT_ENABLED)?'no':'yes'));
+		$type_select->Additem(TRIGGER_MULT_EVENT_ENABLED,S_NORMAL.SPACE.'+'.SPACE.S_MULTIPLE_TRUE_EVENTS,(($type == TRIGGER_MULT_EVENT_ENABLED)?'yes':'no'));
+	/* end new dependence */
+		$frmTrig->AddRow(S_EVENT_GENERATION,$type_select);
 
 		$cmbPrior = new CComboBox("priority",$priority);
 		for($i = 0; $i <= 5; $i++)
@@ -3924,6 +3938,28 @@ include_once 'include/discovery.inc.php';
 		$frmHouseKeep->Show();
 	}
 
+	function	insert_event_ack_form()
+	{
+		$config=select_config();
+		
+		$frmEventAck = new CFormTable(S_ACKNOWLEDGES,"config.php");
+//		$frmEventAck->SetHelp("web.config.workperiod.php");
+		$frmEventAck->AddVar("config",get_request("config",8));
+
+		$exp_select = new CComboBox('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');
+
+		$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));
+
+		$frmEventAck->AddItemToBottomRow(new CButton("save",S_SAVE));
+		$frmEventAck->Show();
+	}
+
 	function	insert_other_parameters_form()
 	{
 		$config=select_config();
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 3c481f0a..6394397a 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -186,15 +186,17 @@
 	'S_WITH_SUBNODES'=>			'With subnodes',
 	
 //	acknow.php
-	'S_ACKNOWLEDGES'=>			'Acknowledges',
-	'S_ACKNOWLEDGE'=>			'Acknowledge',
-	'S_RETURN'=>				'Return',
+	'S_ACKNOWLEDGES'=>				'Acknowledges',
+	'S_ACKNOWLEDGE'=>				'Acknowledge',
+	'S_RETURN'=>					'Return',
 	'S_ACKNOWLEDGE_ALARM_BY'=>		'Acknowledge alarm by',
 	'S_ADD_COMMENT_BY'=>			'Add comment by',
-	'S_COMMENT_ADDED'=>			'Comment added',
+	'S_COMMENT_ADDED'=>			'	Comment added',
 	'S_CANNOT_ADD_COMMENT'=>		'Cannot add coment',
-	'S_ALARM_ACKNOWLEDGES_BIG'=>		'ALARM ACKNOWLEDGES',
+	'S_ALARM_ACKNOWLEDGES_BIG'=>	'ALARM ACKNOWLEDGES',
 	'S_ACKNOWLEDGE_ADDED'=>			'Acknowledge added',
+	'S_SYS_BULK_ACKNOWLEDGE'=>		'----[BULK ACKNOWLEDGE]----',
+	'S_BULK_ACKNOWLEDGE'=>			'Bulk acknowledge',
 
 //	actionconf.php
 	'S_CONFIGURATION_OF_ACTIONS'=>		'Configuration of actions',
@@ -368,6 +370,9 @@
 	'S_YELLOW'=>				'Yellow',
 
 //	config.php
+	'S_EVENT_ACKNOWLEDGES'=>		'Event acknowledges',
+	'S_DAYS'=>						'Days',
+	'S_SHOW_EVENTS_NOT_OLDER'=>			'Show events not older',
 	'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',
@@ -1180,9 +1185,12 @@
 	'S_SEC_SMALL'=>				'sec',
 	'S_COUNTS'=>				'Counts',
 	'S_LAST_OF'=>				'Last of',
+	'S_MULTIPLE_TRUE_EVENTS'=>	'Multiple TRUE events',
 	'S_SHOW_DISABLED_TRIGGERS'=>		'Show disabled triggers',
 	'S_HIDE_DISABLED_TRIGGERS'=>		'Hide disabled triggers',
 
+	'S_MULTIPLE_EVENTS'=>		'Multiple events',
+	'S_EVENT_GENERATION'=>		'Event generation',
 
 //	tr_comments.php
 	'S_TRIGGER_COMMENTS'=>			'Trigger comments',
@@ -1193,24 +1201,30 @@
 
 //	tr_status.php
 	'S_STATUS_OF_TRIGGERS'=>		'Status of triggers',
-	'S_STATUS_OF_TRIGGERS_BIG'=>		'STATUS OF TRIGGERS',
+	'S_STATUS_OF_TRIGGERS_BIG'=>	'STATUS OF TRIGGERS',
 	'S_SHOW_ONLY_TRUE'=>			'Show only true',
-	'S_HIDE_ACTIONS'=>			'Hide actions',
-	'S_SHOW_ACTIONS'=>			'Show actions',
-	'S_SHOW_ALL_TRIGGERS'=>			'Show all triggers',
-	'S_HIDE_DETAILS'=>			'Hide details',
-	'S_SHOW_DETAILS'=>			'Show details',
-	'S_SELECT'=>				'Select',
-	'S_HIDE_SELECT'=>			'Hide select',
-	'S_TRIGGERS_BIG'=>			'TRIGGERS',
-	'S_NAME_BIG'=>				'NAME',
-	'S_SEVERITY_BIG'=>			'SEVERITY',
+	'S_HIDE_ACTIONS'=>				'Hide actions',
+	'S_SHOW_ACTIONS'=>				'Show actions',
+	'S_SHOW_ALL'=>					'Show all',
+	'S_HIDE_ALL'=>					'Hide all',
+	'S_SHOW_ONLY_TRUE'=>			'Show only true',
+	'S_SHOW_NOFALSEFORB'=>			'Show all(no FALSE for B)',
+	'S_SHOW_UNACKNOWLEDGED'=>		'Show unacknowledged',
+	'S_SHOW_TRUE_UNACKNOWLEDGED'=>	'Show true-unacknowledged',
+	'S_NOT_ACKNOWLEDGED'=>			'Not acknowledged',
+	'S_HIDE_DETAILS'=>				'Hide details',
+	'S_SHOW_DETAILS'=>				'Show details',
+	'S_SELECT'=>					'Select',
+	'S_HIDE_SELECT'=>				'Hide select',
+	'S_TRIGGERS_BIG'=>				'TRIGGERS',
+	'S_NAME_BIG'=>					'NAME',
+	'S_SEVERITY_BIG'=>				'SEVERITY',
 	'S_LAST_CHANGE_BIG'=>			'LAST CHANGE',
-	'S_LAST_CHANGE'=>			'Last change',
-	'S_COMMENTS'=>				'Comments',
-	'S_ACKNOWLEDGED'=>			'Acknowledged',
-	'S_ACK'=>				'Ack',
-	'S_NEVER'=>				'Never',
+	'S_LAST_CHANGE'=>				'Last change',
+	'S_COMMENTS'=>					'Comments',
+	'S_ACKNOWLEDGED'=>				'Acknowledged',
+	'S_ACK'=>						'Ack',
+	'S_NEVER'=>						'Never',
 
 //	users.php
 	'S_ZABBIX_USER'=>			'ZABBIX User',
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 40cdf44d..9ec4ae64 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -673,7 +673,7 @@
 
 
 	function	add_trigger(
-		$expression, $description, $priority, $status,
+		$expression, $description, $type, $priority, $status,
 		$comments, $url, $deps=array(), $templateid=0)
 	{
 		if( !validate_expression($expression) )
@@ -682,8 +682,8 @@
 		$triggerid=get_dbid("triggers","triggerid");
 
 		$result=DBexecute("insert into triggers".
-			"  (triggerid,description,priority,status,comments,url,value,error,templateid)".
-			" values ($triggerid,".zbx_dbstr($description).",$priority,$status,".zbx_dbstr($comments).",".
+			"  (triggerid,description,type,priority,status,comments,url,value,error,templateid)".
+			" values ($triggerid,".zbx_dbstr($description).",$type,$priority,$status,".zbx_dbstr($comments).",".
 			"".zbx_dbstr($url).",2,'Trigger just added. No status update so far.',$templateid)");
 		if(!$result)
 		{
@@ -810,9 +810,9 @@
 		$newtriggerid=get_dbid("triggers","triggerid");
 
 		$result = DBexecute("insert into triggers".
-			" (triggerid,description,priority,status,comments,url,value,expression,templateid)".
-			" values ($newtriggerid,".zbx_dbstr($trigger["description"]).",".$trigger["priority"].",".
-			$trigger["status"].",".zbx_dbstr($trigger["comments"]).",".
+			" (triggerid,description,type,priority,status,comments,url,value,expression,templateid)".
+			" values ($newtriggerid,".zbx_dbstr($trigger['description']).','.$trigger['type'].','.$trigger['priority'].','.
+			$trigger['status'].','.zbx_dbstr($trigger['comments']).','.
 			zbx_dbstr($trigger["url"]).",2,'{???:???}',".
 			($copy_mode ? 0 : $triggerid).")");
 
@@ -1271,7 +1271,7 @@
 	 * Comments: !!! Don't forget sync code with C !!!                            *
 	 *                                                                            *
 	 ******************************************************************************/
-	function	update_trigger($triggerid,$expression=NULL,$description=NULL,$priority=NULL,$status=NULL,
+	function	update_trigger($triggerid,$expression=NULL,$description=NULL,$type=NULL,$priority=NULL,$status=NULL,
 		$comments=NULL,$url=NULL,$deps=array(),$templateid=0)
 	{
 		$trigger	= get_trigger_by_triggerid($triggerid);
@@ -1317,6 +1317,7 @@
 						$db_chd_trigger["triggerid"],
 						$newexpression,
 						$description,
+						$type,
 						$priority,
 						NULL,		// status
 						$comments,
@@ -1341,6 +1342,7 @@
 		$sql="update triggers set";
 		if(!is_null($expression))	$sql .= " expression=".zbx_dbstr($expression).",";
 		if(!is_null($description))	$sql .= " description=".zbx_dbstr($description).",";
+		if(!is_null($type))			$sql .= " type=$type,";
 		if(!is_null($priority))		$sql .= " priority=$priority,";
 		if(!is_null($status))		$sql .= " status=$status,";
 		if(!is_null($comments))		$sql .= " comments=".zbx_dbstr($comments).",";