diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-10 08:04:38 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-10 08:04:38 +0000 |
| commit | da89a85a0eeed1b50bc3b5e38b3392e852fa0f72 (patch) | |
| tree | 26daa648960d802c28067bf1a766cdce0c8c79e2 /frontends/php/include/triggers.inc.php | |
| parent | 616715ae783f353d07b1cfa1f48a7631c165a2f8 (diff) | |
| download | zabbix-da89a85a0eeed1b50bc3b5e38b3392e852fa0f72.tar.gz zabbix-da89a85a0eeed1b50bc3b5e38b3392e852fa0f72.tar.xz zabbix-da89a85a0eeed1b50bc3b5e38b3392e852fa0f72.zip | |
- [DEV-144] fixes to trigger mass-update (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5821 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/triggers.inc.php')
| -rw-r--r-- | frontends/php/include/triggers.inc.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php index f9a35473..d2b6a68c 100644 --- a/frontends/php/include/triggers.inc.php +++ b/frontends/php/include/triggers.inc.php @@ -198,8 +198,8 @@ $available_hosts = get_accessible_hosts_by_user($USER_DETAILS, $perm, PERM_RES_IDS_ARRAY, $nodeid); - $denied_graphs = array(); - $available_graphs = array(); + $denied_triggers = array(); + $available_triggers = array(); $sql = 'SELECT DISTINCT t.triggerid '. ' FROM triggers t, functions f, items i '. @@ -207,7 +207,6 @@ ' AND f.itemid=i.itemid'. (!empty($hostid)?' AND i.hostid='.$hostid:''). ' AND '.DBcondition('i.hostid',$available_hosts,true); - $db_triggers = DBselect($sql); while($trigger = DBfetch($db_triggers)){ $denied_triggers[] = $trigger['triggerid']; @@ -217,10 +216,9 @@ ' FROM triggers t, functions f, items i '. ' WHERE t.triggerid=f.triggerid '. ' AND f.itemid=i.itemid'. - ' AND i.status='.ITEM_STATUS_ACTIVE. (!empty($hostid)?' AND i.hostid='.$hostid:''). (!empty($denied_triggers)?' AND '.DBcondition('t.triggerid',$denied_triggers,true):''); - + $db_triggers = DBselect($sql); while($trigger = DBfetch($db_triggers)){ $result[$trigger['triggerid']] = $trigger['triggerid']; |