diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-31 07:41:24 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-31 07:41:24 +0000 |
| commit | c28d86f5ee7cddfde35cc61daa9a726e2e68509b (patch) | |
| tree | b68d2a0c6f5f3b7071c8062139573fd3d24611a6 /frontends/php/services.php | |
| parent | 4ce0c92b675da5d30bab11464ae51b7bd9b51a1a (diff) | |
| download | zabbix-c28d86f5ee7cddfde35cc61daa9a726e2e68509b.tar.gz zabbix-c28d86f5ee7cddfde35cc61daa9a726e2e68509b.tar.xz zabbix-c28d86f5ee7cddfde35cc61daa9a726e2e68509b.zip | |
- fixed permissions in IT Services (Artem/Eugene)
- fixed adding 'root' to services
git-svn-id: svn://svn.zabbix.com/trunk@4214 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/services.php')
| -rw-r--r-- | frontends/php/services.php | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/frontends/php/services.php b/frontends/php/services.php index 4a4ea993..9c161a77 100644 --- a/frontends/php/services.php +++ b/frontends/php/services.php @@ -36,30 +36,21 @@ include_once "include/page_header.php"; check_fields($fields); -//---------------------------------------------------------------------- - - $denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT); - - if(isset($_REQUEST['serviceid']) && $_REQUEST['serviceid'] > 0){ - $query = "SELECT s.*,sl.linkid FROM services s LEFT JOIN triggers t on s.triggerid=t.triggerid ". - " 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 ".DBid2nodeid("s.serviceid")."=".$ZBX_CURNODEID. - " and s.serviceid=".$_REQUEST["serviceid"]; - if( !($service = DBFetch(DBSelect($query))) ){ - access_deny(); - } - } //-------------------------------------------------------------------------- +$denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT); + $query = 'SELECT distinct s.serviceid, sl.servicedownid, sl_p.serviceupid as serviceupid, - s.name caption, s.algorithm, t.triggerid, s.sortorder, sl.linkid - 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 - WHERE '.DBid2nodeid("s.serviceid").'='.$ZBX_CURNODEID.' - ORDER BY s.sortorder, sl.serviceupid, s.serviceid'; + s.name caption, s.algorithm, t.triggerid, s.sortorder, sl.linkid'. + ' 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 '.DBid2nodeid("s.serviceid").'='.$ZBX_CURNODEID. + ' ORDER BY s.sortorder, sl.serviceupid, s.serviceid'; $result=DBSelect($query); @@ -100,6 +91,10 @@ while($row = DBFetch($result)){ $treeServ=array(); createServiceTree($services,$treeServ); //return into $treeServ parametr +//permission issue +$treeServ = del_empty_nodes($treeServ); + + echo '<script src="js/services.js" type="text/javascript"></script>'; $p = new Ctag('p','yes'); |