diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-02 12:23:31 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-02 12:23:31 +0000 |
| commit | 78134fbc73c8f2f947722093fb1d625268a60552 (patch) | |
| tree | b84e3301b46e0a6054e8c2f55d34044050fa14b9 /frontends/php/include/maps.inc.php | |
| parent | 3e5c8f13f71b5297f5c6621b7156e381606f06ac (diff) | |
- merged rev. 4501:4502 of branches/1.4.2 (Eugene)
[ - added undefined element message 'No **** defined' instead 'Premission deny' (Eugene)
- fixed items,graphs,hostgroups deletion (Eugene)
- fixed permisions for maps (Eugene) ]
git-svn-id: svn://svn.zabbix.com/trunk@4505 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/maps.inc.php')
| -rw-r--r-- | frontends/php/include/maps.inc.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php index b4528584..ad1e6666 100644 --- a/frontends/php/include/maps.inc.php +++ b/frontends/php/include/maps.inc.php @@ -50,7 +50,8 @@ $result &= sysmap_accessiable($se_data['elementid'], PERM_READ_ONLY); break; case SYSMAP_ELEMENT_TYPE_TRIGGER: - if(!DBfetch(DBselect("select distinct t.*". + if( DBfetch(DBselect('select triggerid from triggers where triggerid='.$se_data['elementid'])) && + !DBfetch(DBselect("select distinct t.*". " from triggers t,items i,functions f". " where f.itemid=i.itemid and t.triggerid=f.triggerid". " and i.hostid not in (".$denyed_hosts.") and t.triggerid=".$se_data['elementid']))) @@ -58,9 +59,10 @@ $result = false; } break; - case SYSMAP_ELEMENT_TYPE_HOST: - if(in_array($se_data['elementid'], - get_accessible_groups_by_user($USER_DETAILS,PERM_READ_ONLY, PERM_MODE_LT))) + case SYSMAP_ELEMENT_TYPE_HOST_GROUP: + if( DBfetch(DBselect('select groupid from groups where groupid='.$se_data['elementid'])) && + in_array($se_data['elementid'], + get_accessible_groups_by_user($USER_DETAILS,PERM_READ_ONLY, PERM_MODE_LT, PERM_RES_IDS_ARRAY))) { $result = false; } |