- improvements in permission check graphs & services (Artem)

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

1 files changed, 5 insertions, 7 deletions

diff --git a/frontends/php/services.php b/frontends/php/services.php
index 677997ed..51b55154 100644
--- a/frontends/php/services.php
+++ b/frontends/php/services.php
@@ -60,18 +60,16 @@ include_once "include/page_header.php";
 
 //--------------------------------------------------------------------------
 
-$denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT);
+$available_triggers = get_accessible_triggers(PERM_READ_ONLY, null, get_current_nodeid());
 
-$query = 'SELECT distinct s.serviceid, sl.servicedownid, sl_p.serviceupid as serviceupid,
-		s.name as caption, s.algorithm, t.triggerid, s.sortorder, sl.linkid'.
+$query = 'SELECT DISTINCT s.serviceid, sl.servicedownid, sl_p.serviceupid as serviceupid, s.triggerid, '.
+		' s.name as caption, s.algorithm, t.description, t.expression, s.sortorder, sl.linkid, s.showsla, s.goodsla, s.status '.
 	' FROM services s '.
 		' LEFT JOIN triggers t ON s.triggerid = t.triggerid '.
 		' LEFT JOIN services_links sl ON  s.serviceid = sl.serviceupid and NOT(sl.soft=0) '.
 		' LEFT JOIN services_links sl_p ON  s.serviceid = sl_p.servicedownid and sl_p.soft=0 '.
-		' LEFT JOIN functions f ON t.triggerid=f.triggerid '.
-		' LEFT JOIN items i ON f.itemid=i.itemid '.
-	' WHERE (i.hostid is null or i.hostid not in ('.$denyed_hosts.')) '.
-		' AND '.DBin_node('s.serviceid').
+	' WHERE '.DBin_node('s.serviceid').
+		' AND (t.triggerid IS NULL OR t.triggerid IN ('.$available_triggers.')) '.
 	' ORDER BY s.sortorder, sl_p.serviceupid, s.serviceid';
 
 $result=DBSelect($query);