- [NTT-36] merged rev. 4938:4943 of branches/1.4.j/ (Artem) (fixes for "No False for B")

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

1 files changed, 7 insertions, 25 deletions

diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php
index 0a0d8c73..9126fdc3 100644
--- a/frontends/php/tr_status.php
+++ b/frontends/php/tr_status.php
@@ -431,22 +431,10 @@ include_once "include/page_header.php";
 					' AND t.triggerid=e.objectid '.$cond.
 				' ORDER BY e.eventid DESC';
 
-		if($show_triggers == TRIGGERS_OPTION_NOFALSEFORB){
-//		if(!$eventid = first_initial_eventid($row,$show_unknown)) continue;
-
-			$sql = 'SELECT e.eventid, e.value, e.clock as lastchange'.
-					' FROM events e, triggers t '.
-					' WHERE e.object=0 AND e.objectid='.$row['triggerid'].
-						' AND t.triggerid=e.objectid '.$cond.
-						' ORDER by e.eventid DESC';
-	
-			$res_events = DBSelect($sql,1);
-			if(!$e_row=DBfetch($res_events)){
-				continue;
-			}
-			else{
-				$row = array_merge($row,$e_row);
-			}
+
+		if(($show_triggers == TRIGGERS_OPTION_NOFALSEFORB) && ($row['value']!=TRIGGER_VALUE_TRUE)){
+			
+			$row = get_row_for_nofalseforb($row,$cond);
 		}
 
 		$elements=array();
@@ -520,18 +508,12 @@ include_once "include/page_header.php";
 				new CLink(($row["comments"] == "") ? S_ADD : S_SHOW,"tr_comments.php?triggerid=".$row["triggerid"],"action")
 				));
 
-		$prev_event_value = '';
-		
 		$res_events = DBSelect($event_sql);
 		while($row_event=DBfetch($res_events)){
 
-//			if($row['eventid'] == $row_event['eventid']) continue;
-//			if(($show_unknown == 0) && (!event_initial_time($row_event,$show_unknown))) continue;
-			if(($show_events == EVENTS_OPTION_NOFALSEFORB) && 
-				($prev_event_value == $row_event['value']) && 
-				($row_event['value'] == TRIGGER_VALUE_FALSE)
-				)	continue;
-			$prev_event_value = $row_event['value'];
+			if(($show_events == EVENTS_OPTION_NOFALSEFORB) && ($row_event['value'] == TRIGGER_VALUE_FALSE)){
+				if(!event_initial_time($row_event)) continue;
+			}
 			
 			$value = new CSpan(trigger_value2str($row_event['value']), get_trigger_value_style($row_event['value']));