diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-17 15:02:02 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-17 15:02:02 +0000 |
| commit | b82812f00576369e65c996ef51264de66ce63d57 (patch) | |
| tree | a3ba8c407e03edd1905f591aa2d14bf32acc4f9b /frontends/php/include/maps.inc.php | |
| parent | cd6be85dfcfccb202f2d2a9ca9db062725e45d5c (diff) | |
| download | zabbix-b82812f00576369e65c996ef51264de66ce63d57.tar.gz zabbix-b82812f00576369e65c996ef51264de66ce63d57.tar.xz zabbix-b82812f00576369e65c996ef51264de66ce63d57.zip | |
- [DEV-137] fixes in graph zoom for KQ (Artem)
- [DEV-137] fixes for possible errors under Oracle (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5632 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/maps.inc.php')
| -rw-r--r-- | frontends/php/include/maps.inc.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php index 40329cb8..f6cd6f54 100644 --- a/frontends/php/include/maps.inc.php +++ b/frontends/php/include/maps.inc.php @@ -88,12 +88,12 @@ ' AND '.DBin_node('sysmapid', get_current_nodeid($perm)))) { $result = true; - $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); while(($se_data = DBfetch($db_result)) && $result){ switch($se_data['elementtype']){ case SYSMAP_ELEMENT_TYPE_HOST: - if(!uint_in_array($se_data['elementid'],explode(',',$available_hosts))){ + if(!uint_in_array($se_data['elementid'],$available_hosts)){ $result = false; } break; @@ -101,12 +101,12 @@ $result &= sysmap_accessible($se_data['elementid'], PERM_READ_ONLY); break; case SYSMAP_ELEMENT_TYPE_TRIGGER: - $available_triggers = get_accessible_triggers(PERM_READ_ONLY, null, get_current_nodeid()); + $available_triggers = get_accessible_triggers(PERM_READ_ONLY, PERM_RES_IDS_ARRAY); $sql = 'SELECT t.triggerid '. ' FROM triggers t'. ' WHERE t.triggerid='.$se_data['elementid']. - ' AND t.triggerid NOT IN ('.$available_triggers.') '; + ' AND '.DBcondition('t.triggerid',$available_triggers,true); if(DBfetch(DBselect($sql,1))){ $result = false; } |