summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/maps.inc.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-14 13:26:42 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-14 13:26:42 +0000
commit5348f67b28ed1da2539db6de7a11c605a5dc3a57 (patch)
tree4646832d5a7263dbe6818409d9ce9e9dff419008 /frontends/php/include/maps.inc.php
parentc44eed92d3f3bcfc0efad6e18e31323f089a9ce6 (diff)
downloadzabbix-5348f67b28ed1da2539db6de7a11c605a5dc3a57.tar.gz
zabbix-5348f67b28ed1da2539db6de7a11c605a5dc3a57.tar.xz
zabbix-5348f67b28ed1da2539db6de7a11c605a5dc3a57.zip
- [DEV-142] added transactions to DB actions (beta) (Artem)
- [DEV-137] improvements in permission checks (Artem) - [DEV-137] changes in schema (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5619 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/maps.inc.php')
-rw-r--r--frontends/php/include/maps.inc.php14
1 files changed, 5 insertions, 9 deletions
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index 303bced6..40329cb8 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -113,7 +113,7 @@
break;
case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
- $available_groups = get_accessible_groups_by_user($USER_DETAILS,PERM_READ_ONLY, null);
+ $available_groups = get_accessible_groups_by_user($USER_DETAILS,PERM_READ_ONLY);
$sql = 'SELECT g.groupid '.
' FROM groups g '.
@@ -192,16 +192,12 @@
while($rows = DBfetch($res)){
$result&=delete_link($rows['linkid']);
}
-// $result = DBexecute("delete FROM sysmaps_links WHERE sysmapid=$sysmapid");
-// if(!$result) return $result;
- $result = DBexecute("delete FROM sysmaps_elements WHERE sysmapid=$sysmapid");
- if(!$result) return $result;
+ $result = DBexecute('delete FROM sysmaps_elements WHERE sysmapid='.$sysmapid);
+ $result &= DBexecute('DELETE FROM profiles WHERE idx="web.favorite.sysmapids" AND resource="sysmapid" AND value='.$sysmapid);
+ $result &= DBexecute('DELETE FROM sysmaps WHERE sysmapid='.$sysmapid);
- $result = rm4favorites('web.favorite.sysmapids',$sysmapd,ZBX_FAVORITES_ALL,'sysmapid');
- if(!$result) return $result;
-
- return DBexecute("delete FROM sysmaps WHERE sysmapid=$sysmapid");
+ return $result;
}
// LINKS