- fixed permissions for triggers (Eugene)

 - developed 'mass update' functionality for items (Eugene)



git-svn-id: svn://svn.zabbix.com/trunk@3772 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 5 insertions, 9 deletions

diff --git a/frontends/php/tr_events.php b/frontends/php/tr_events.php
index f940019b..522ede73 100644
--- a/frontends/php/tr_events.php
+++ b/frontends/php/tr_events.php
@@ -41,16 +41,12 @@ include_once "include/page_header.php";
 	);
 	check_fields($fields);
 	
-	$denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY, PERM_MODE_LT);
-	
-	if(! ($trigger_data = DBfetch(DBselect('select h.host, t.* from hosts h, items i, functions f, triggers t '.
-	                        ' where i.itemid=f.itemid and f.triggerid=t.triggerid and t.triggerid='.$_REQUEST["triggerid"].
-				" and i.hostid not in (".$denyed_hosts.") and h.hostid=i.hostid ".
-				" and ".DBid2nodeid("t.triggerid")."=".$ZBX_CURNODEID
-				))))
-	{
+	if(!check_right_on_trigger_by_triggerid(PERM_READ_ONLY, $_REQUEST["triggerid"]))
 		access_deny();
-	}
+
+	$trigger_data = DBfetch(DBselect('select h.host, t.* from hosts h, items i, functions f, triggers t '.
+	                        ' where i.itemid=f.itemid and f.triggerid=t.triggerid and t.triggerid='.$_REQUEST["triggerid"].
+				" and h.hostid=i.hostid and ".DBid2nodeid("t.triggerid")."=".$ZBX_CURNODEID));
 ?>
 <?php
 	$_REQUEST["limit"] = get_request("limit","NO");