diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2004-01-21 20:01:32 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2004-01-21 20:01:32 +0000 |
| commit | 200ed3d70212030ebb53bc9671c990dea8fe170d (patch) | |
| tree | b528c3f4ab4c89d1213d695c8195a10b72798da3 /frontends/php/include | |
| parent | d386354e3ca27209d9a22d1c509fac49717cf0eb (diff) | |
| download | zabbix-200ed3d70212030ebb53bc9671c990dea8fe170d.tar.gz zabbix-200ed3d70212030ebb53bc9671c990dea8fe170d.tar.xz zabbix-200ed3d70212030ebb53bc9671c990dea8fe170d.zip | |
- fixed removal of trigger dependency (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@1197 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/config.inc.php | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index e70042ba..a53797c0 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -2152,25 +2152,40 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid"; function delete_trigger_dependency($triggerid_down,$triggerid_up) { +// Why this was here? +// $sql="select count(*) from trigger_depends where triggerid_down=$triggerid_up and triggerid_up=$triggerid_down"; +// $result=DBexecute($sql); +// if(DBget_field($result,0,0)>0) +// { +// return FALSE; +// } - $sql="select count(*) from trigger_depends where triggerid_down=$triggerid_up and triggerid_up=$triggerid_down"; - $result=DBexecute($sql); - if(DBget_field($result,0,0)>0) - { - return FALSE; - } +// It was wrong - was deleting all dependencies +// $sql="select triggerid_down,triggerid_up from trigger_depends where triggerid_up=$triggerid_up or triggerid_down=$triggerid_down"; +// $result=DBexecute($sql); +// for($i=0;$i<DBnum_rows($result);$i++) +// { +// $down=DBget_field($result,$i,0); +// $up=DBget_field($result,$i,1); +// $sql="delete from trigger_depends where triggerid_up=$up and triggerid_down=$down"; +// DBexecute($sql); +// $sql="update triggers set dep_level=dep_level-1 where triggerid=$up"; +// DBexecute($sql); +// } - $sql="select triggerid_down,triggerid_up from trigger_depends where triggerid_up=$triggerid_up or triggerid_down=$triggerid_down"; + $sql="select triggerid_down,triggerid_up from trigger_depends where triggerid_up=$triggerid_up and triggerid_down=$triggerid_down"; $result=DBexecute($sql); for($i=0;$i<DBnum_rows($result);$i++) { $down=DBget_field($result,$i,0); $up=DBget_field($result,$i,1); - $sql="delete from trigger_depends where triggerid_up=$up and triggerid_down=$down"; - DBexecute($sql); $sql="update triggers set dep_level=dep_level-1 where triggerid=$up"; DBexecute($sql); } + + $sql="delete from trigger_depends where triggerid_up=$triggerid_up and triggerid_down=$triggerid_down"; + DBexecute($sql); + return TRUE; } |