- [DEV-45] merged rev. 5008:5009 of branches/1.4.j/ (Artem) [added support of trigger "type B" to events screen]

git-svn-id: svn://svn.zabbix.com/trunk@5011 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 10 insertions, 3 deletions

diff --git a/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php
index 2e1f1c3b..5599b29b 100644
--- a/frontends/php/include/events.inc.php
+++ b/frontends/php/include/events.inc.php
@@ -51,8 +51,7 @@
 			$sql_cond.= ' AND e.value<>2 ';
 		}
 	
-
-       
+      
 		$table = new CTableInfo(S_NO_EVENTS_FOUND); 
 		$table->SetHeader(array(
 				make_sorting_link(S_TIME,'e.clock'),
@@ -63,7 +62,8 @@
 				make_sorting_link(S_SEVERITY,'t.priority')
 				));
 				
-		$result = DBselect('SELECT DISTINCT t.triggerid,t.priority,t.description,t.expression,h.host,h.hostid,e.clock,e.value '.
+		$result = DBselect('SELECT DISTINCT t.triggerid,t.priority,t.description, '.
+					't.expression,h.host,h.hostid,e.clock,e.value,t.type '.
 			' FROM events e, triggers t, functions f, items i, hosts h '.$sql_from.
 			' WHERE '.DBin_node('t.triggerid').
 				' AND e.objectid=t.triggerid and e.object='.EVENT_OBJECT_TRIGGER.
@@ -201,6 +201,13 @@ function event_initial_time($row,$show_unknown=0){
 	while($rows = DBfetch($res)){
 		$events[] = $rows;
 	}
+	if(!empty($events) && 
+		($events[0]['value'] == $row['value']) && 
+		($row['type'] == TRIGGER_MULT_EVENT_ENABLED) && 	
+		($row['value'] == TRIGGER_VALUE_TRUE))
+	{
+		return true;
+	}
 	if(!empty($events) && ($events[0]['value'] == $row['value'])){
 		return false;
 	}