From 0e123743f061d20b4c0351653a692597a97af37b Mon Sep 17 00:00:00 2001 From: artem Date: Tue, 30 Oct 2007 12:15:05 +0000 Subject: - [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 --- frontends/php/include/triggers.inc.php | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'frontends/php/include/triggers.inc.php') 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; + } ?> -- cgit