From 469d17e7d448ec1833abb72add88d1d1f61c4a06 Mon Sep 17 00:00:00 2001 From: artem Date: Wed, 20 Aug 2008 14:46:11 +0000 Subject: - [DEV-199] performance improvements of js scripts in hosts screen (Artem) - [DEV-137] many small fixes (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5932 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/charts.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'frontends/php/charts.php') diff --git a/frontends/php/charts.php b/frontends/php/charts.php index ad447b6c..44905738 100644 --- a/frontends/php/charts.php +++ b/frontends/php/charts.php @@ -133,7 +133,7 @@ include_once 'include/page_header.php'; $h1 = array(); $available_groups = get_accessible_groups_by_user($USER_DETAILS,PERM_READ_LIST); - $available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_LIST,PERM_RES_IDS_ARRAY); + $available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_LIST); $available_graphs = get_accessible_graphs(PERM_READ_LIST, PERM_RES_IDS_ARRAY, get_current_nodeid()); @@ -168,7 +168,7 @@ include_once 'include/page_header.php'; if($_REQUEST['groupid'] == 0){ $sql = 'SELECT COUNT(DISTINCT g.groupid) as grpcount, MAX(g.groupid) as groupid'. ' FROM groups g, hosts_groups hg, hosts h, items i, graphs_items gi '. - ' WHERE g.groupid in ('.$available_groups.') '. + ' WHERE '.DBcondition('g.groupid',$available_groups). ' AND hg.groupid=g.groupid '. ' AND h.status='.HOST_STATUS_MONITORED. ' AND h.hostid=i.hostid '. @@ -231,7 +231,7 @@ include_once 'include/page_header.php'; $result=DBselect('SELECT DISTINCT g.groupid, g.name '. ' FROM groups g, hosts_groups hg, hosts h, items i, graphs_items gi '. - ' WHERE g.groupid in ('.$available_groups.') '. + ' WHERE '.DBcondition('g.groupid',$available_groups). ' AND hg.groupid=g.groupid '. ' AND h.status='.HOST_STATUS_MONITORED. ' AND h.hostid=i.hostid '. -- cgit