diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-23 09:37:47 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-23 09:37:47 +0000 |
| commit | 5c3768ceaa3080321c3bf6481640fcdd380d0025 (patch) | |
| tree | 172b94421c008b166a1106c5c42f983c2b8fe5b3 /frontends/php/report5.php | |
| parent | 6db9d7bcf88b79ab279dd2b5dc929fabb1a23f1f (diff) | |
| download | zabbix-5c3768ceaa3080321c3bf6481640fcdd380d0025.tar.gz zabbix-5c3768ceaa3080321c3bf6481640fcdd380d0025.tar.xz zabbix-5c3768ceaa3080321c3bf6481640fcdd380d0025.zip | |
- [DEV-192] added filter to Status of triggers (Artem)
- [DEV-191] monitoring screens inline update preparation (Artem)
- [DEV-192] added severity filter in status of triggers (Artem)
- [DEV-137] sql fixes for oracle (Artem)
- [ZBX-396] fixed error maps message (Artem)
- [ZBX-394] fixed showing hosts without group in status of triggers (Artem)
- [DEV-137] small fixes (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5841 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/report5.php')
| -rw-r--r-- | frontends/php/report5.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/report5.php b/frontends/php/report5.php index e21a1c81..f2c011ca 100644 --- a/frontends/php/report5.php +++ b/frontends/php/report5.php @@ -71,7 +71,7 @@ include_once "include/page_header.php"; default: $time_dif=24*3600; break; } - $accessible_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY); + $available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,PERM_RES_IDS_ARRAY); $sql = 'SELECT h.host, t.triggerid, t.description, t.expression, t.priority, count(distinct e.eventid) as cnt_event '. ' FROM hosts h, triggers t, functions f, items i, events e'. ' WHERE h.hostid = i.hostid '. @@ -80,7 +80,7 @@ include_once "include/page_header.php"; ' and t.triggerid=e.objectid '. ' and e.object='.EVENT_OBJECT_TRIGGER. ' and e.clock>'.(time()-$time_dif). - ' and h.hostid in ('.$accessible_hosts.') '. + ' and '.DBcondition('h.hostid',$available_hosts). ' and '.DBin_node('t.triggerid'). ' GROUP BY h.host,t.triggerid,t.description,t.expression,t.priority '. ' ORDER BY cnt_event desc, h.host, t.description, t.triggerid'; @@ -88,7 +88,7 @@ include_once "include/page_header.php"; $result=DBselect($sql, 100); while($row=DBfetch($result)){ - if(!check_right_on_trigger_by_triggerid(null, $row['triggerid'], $accessible_hosts)) + if(!check_right_on_trigger_by_triggerid(null, $row['triggerid'], $available_hosts)) continue; $table->addRow(array( |