- [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, 32 insertions, 0 deletions

diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 01a5903d..86ab4fcd 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -2210,4 +2210,36 @@
 		}
 		return $result;
 	}
+	
+	function get_row_for_nofalseforb($row,$cond){
+		$sql = 'SELECT e.eventid, e.value, e.clock as lastchange, e.clock'.
+				' 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(!event_initial_time($row)){
+			if(!$eventid = first_initial_eventid($row,0)) continue;
+
+			$sql = 'SELECT e.eventid, e.value, e.clock as lastchange'.
+					' FROM events e '.
+					' WHERE e.object=0 AND e.eventid='.$eventid;
+	
+			$res_events = DBSelect($sql,1);
+			if(!$e_row=DBfetch($res_events)){
+				continue;
+			}
+			else{
+				$row = array_merge($row,$e_row);
+			}
+		}
+	return $row;
+	}
 ?>