From 33ca5f663dca2bb55a10c10aa45acedb5be130ab Mon Sep 17 00:00:00 2001 From: hugetoad Date: Tue, 17 Feb 2004 22:41:20 +0000 Subject: Improvements for new algorithm for action handling. git-svn-id: svn://svn.zabbix.com/trunk@1262 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/actions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'frontends/php/actions.php') diff --git a/frontends/php/actions.php b/frontends/php/actions.php index 3fdbfe3f..0921deab 100644 --- a/frontends/php/actions.php +++ b/frontends/php/actions.php @@ -146,7 +146,8 @@ $found=0; while($row2=DBfetch($result2)) { - $sql="select * from actions a,triggers t,hosts h,functions f,items i where a.triggerid=t.triggerid and f.triggerid=t.triggerid and h.hostid=a.triggerid and i.hostid=h.hostid and a.actionid=".$row["actionid"]." and a.scope=1 and h.hostid=".$row2["hostid"]; +// $sql="select * from actions a,triggers t,hosts h,functions f,items i where a.triggerid=t.triggerid and f.triggerid=t.triggerid and h.hostid=a.triggerid and i.hostid=h.hostid and a.actionid=".$row["actionid"]." and a.scope=1 and h.hostid=".$row2["hostid"]; + $sql="select * from actions a where a.actionid=".$row["actionid"]." and a.scope=1 and a.triggerid=".$row2["hostid"]; // echo "$sql
"; $result3=DBselect($sql); if(DBnum_rows($result3)>0) $found=1; -- cgit