- fixed events.triggerid requests

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

4 files changed, 22 insertions, 15 deletions

diff --git a/frontends/php/include/acknow.inc.php b/frontends/php/include/acknow.inc.php
index 5d08ef03..e4dcfa18 100644
--- a/frontends/php/include/acknow.inc.php
+++ b/frontends/php/include/acknow.inc.php
@@ -21,8 +21,8 @@
 <?php
 	function	get_last_event_by_triggerid($triggerid)
 	{
-		$event_data = DBfetch(DBselect("select * from events where triggerid=$triggerid".
-			" order by clock desc", 1));
+		$event_data = DBfetch(DBselect('select * from events where objectid='.$triggerid.
+			' and object='.EVENT_OBJECT_TRIGGER.' order by clock desc', 1));
 		if(!$event_data)
 			return FALSE;
 		return $event_data;
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 76ab6bf0..f785f788 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -311,6 +311,13 @@
 	define("HTTPSTEP_ITEM_TYPE_TIME",	1);
 	define("HTTPSTEP_ITEM_TYPE_IN",		2);
 	define("HTTPSTEP_ITEM_TYPE_LASTSTEP",	3);
+
+	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("BR",	"<br/>\n");
 	define("SPACE",	"&nbsp;");
diff --git a/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php
index 4a203249..938fbb92 100644
--- a/frontends/php/include/events.inc.php
+++ b/frontends/php/include/events.inc.php
@@ -42,7 +42,7 @@
 		$result = DBselect("select distinct t.triggerid,t.priority,t.description,h.host,e.clock,e.value ".
 			" from events e, triggers t, functions f, items i, hosts h ".$sql_from.
 			" where ".DBid2nodeid("t.triggerid")."=".$nodeid.
-			" and e.triggerid=t.triggerid and t.triggerid=f.triggerid and f.itemid=i.itemid ".
+			' and e.objectid=t.triggerid and e.object='.EVENT_OBJECT_TRIGGER.' and t.triggerid=f.triggerid and f.itemid=i.itemid '.
 			" and i.hostid=h.hostid ".$sql_cond." and h.status=".HOST_STATUS_MONITORED.
 			" order by e.clock desc,h.host,t.priority,t.description,t.triggerid ",
 			10*($start+$num)
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 0aa17e53..876a61c4 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -696,7 +696,8 @@
 	{
 		if(is_null($time)) $time = time();
 
-		$result = DBselect('select value from events where triggerid='.$triggerid.' order by clock desc',1);
+		$result = DBselect('select value from events where objectid='.$triggerid.' and object='.EVENT_OBJECT_TRIGGER.
+			' order by clock desc',1);
 		$last_value = DBfetch($result);
 		if($last_value)
 		{
@@ -704,7 +705,8 @@
 				return false;
 		}
 		$eventid = get_dbid("events","eventid");
-		$result = DBexecute('insert into events(eventid,triggerid,clock,value) values('.$eventid.','.$triggerid.','.$time.','.$value.')');
+		$result = DBexecute('insert into events(eventid,source,object,objectid,clock,value) '.
+				' values('.$eventid.','.EVENT_SOURCE_TRIGGERS.','.EVENT_OBJECT_TRIGGER.','.$triggerid.','.$time.','.$value.')');
 		if($value == TRIGGER_VALUE_FALSE || $value == TRIGGER_VALUE_TRUE)
 		{
 			DBexesute('update alerts set retries=3,error=\'Trigger changed its status. WIll not send repeats.\''.
@@ -968,7 +970,7 @@
 
 	function	delete_events_by_triggerid($triggerid)
 	{
-		return	DBexecute("delete from events where triggerid=$triggerid");
+		return	DBexecute('delete from events where objectid='.$triggerid.' and object='.EVENT_OBJECT_TRIGGER);
 	}
 
 	function	delete_triggers_by_itemid($itemid)
@@ -1253,14 +1255,11 @@
 
 	function	calculate_availability($triggerid,$period_start,$period_end)
 	{
-		if(($period_start==0)&&($period_end==0))
-		{
-	        	$sql="select count(*) as cnt,min(clock) as minn,max(clock) as maxx from events where triggerid=$triggerid";
-		}
-		else
-		{
-	        	$sql="select count(*) as cnt,min(clock) as minn,max(clock) as maxx from events where triggerid=$triggerid and clock>=$period_start and clock<=$period_end";
-		}
+		$sql='select count(*) as cnt,min(clock) as minn,max(clock) as maxx from events '.
+			' where objectid='.$triggerid.' and object='.EVENT_OBJECT_TRIGGER;
+
+		if($period_start!=0)	$sql .= ' and clock>='.$period_start;
+		if($period_end!=0)	$sql .= ' and clock<='.$period_end;
 
 		$row=DBfetch(DBselect($sql));
 		if($row["cnt"]>0)
@@ -1287,7 +1286,8 @@
 			}
 		}
 
-		$result=DBselect("select clock,value from events where triggerid=$triggerid and clock>=$min and clock<=$max");
+		$result=DBselect('select clock,value from events where objectid='.$triggerid.' and object='.EVENT_OBJECT_TRIGGER
+			.' and clock>='.$min.' and clock<='.$max);
 
 		$state		= -1;
 		$true_time	= 0;