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/include/graphs.inc.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/include/graphs.inc.php')
| -rw-r--r-- | frontends/php/include/graphs.inc.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php index 7159d424..84bfa6c6 100644 --- a/frontends/php/include/graphs.inc.php +++ b/frontends/php/include/graphs.inc.php @@ -165,14 +165,14 @@ */ function graph_accessible($graphid){ global $USER_DETAILS; - $available_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 g.graphid '. ' FROM graphs g, graphs_items gi, items i '. ' WHERE g.graphid='.$graphid. ' AND g.graphid=gi.graphid '. ' AND i.itemid=gi.itemid '. - ' AND i.hostid NOT IN ('.$available_hosts.')'; + ' AND '.DBcondition('i.hostid',$available_hosts,true); if(DBfetch(DBselect($sql,1))){ return false; @@ -197,7 +197,7 @@ if(is_null($perm_res)) $perm_res = PERM_RES_STRING_LINE; - $available_hosts = get_accessible_hosts_by_user($USER_DETAILS, $perm, null, $nodeid); + $available_hosts = get_accessible_hosts_by_user($USER_DETAILS, $perm, PERM_RES_IDS_ARRAY, $nodeid); $denied_graphs = array(); $result = array(); @@ -207,7 +207,7 @@ ' WHERE g.graphid=gi.graphid '. (!empty($hostid)?' AND i.hostid='.$hostid:''). ' AND i.itemid=gi.itemid '. - ' AND i.hostid NOT IN ('.$available_hosts.')'; + ' AND '.DBcondition('i.hostid',$available_hosts, true); $db_graphs = DBselect($sql); while($graph = DBfetch($db_graphs)){ |