diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-23 09:37:47 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-23 09:37:47 +0000 |
| commit | 5c3768ceaa3080321c3bf6481640fcdd380d0025 (patch) | |
| tree | 172b94421c008b166a1106c5c42f983c2b8fe5b3 /frontends/php/httpconf.php | |
| parent | 6db9d7bcf88b79ab279dd2b5dc929fabb1a23f1f (diff) | |
- [DEV-192] added filter to Status of triggers (Artem)
- [DEV-191] monitoring screens inline update preparation (Artem)
- [DEV-192] added severity filter in status of triggers (Artem)
- [DEV-137] sql fixes for oracle (Artem)
- [ZBX-396] fixed error maps message (Artem)
- [ZBX-394] fixed showing hosts without group in status of triggers (Artem)
- [DEV-137] small fixes (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5841 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/httpconf.php')
| -rw-r--r-- | frontends/php/httpconf.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/frontends/php/httpconf.php b/frontends/php/httpconf.php index a880741f..d9c4d2b2 100644 --- a/frontends/php/httpconf.php +++ b/frontends/php/httpconf.php @@ -80,9 +80,9 @@ include_once "include/page_header.php"; $showdisabled = get_request("showdisabled", 0); - $accessible_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE); + $available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_RES_IDS_ARRAY); - if(isset($_REQUEST['hostid']) && !uint_in_array($_REQUEST['hostid'], explode(',',$accessible_hosts))){ + if(isset($_REQUEST['hostid']) && !uint_in_array($_REQUEST['hostid'], $available_hosts)){ unset($_REQUEST['hostid']); } @@ -329,7 +329,7 @@ include_once "include/page_header.php"; $result=DBselect('select distinct g.groupid,g.name '. ' from groups g,hosts_groups hg '. ' where g.groupid=hg.groupid '. - ' and hg.hostid in ('.$accessible_hosts.') '. + ' and '.DBcondition('hg.hostid',$available_hosts). ' order by name'); while($row=DBfetch($result)){ $cmbGroup->AddItem($row["groupid"],$row["name"]); @@ -343,7 +343,7 @@ include_once "include/page_header.php"; ' where hg.groupid='.$_REQUEST["groupid"]. ' and hg.hostid=h.hostid '. ' and h.status in ('.HOST_STATUS_MONITORED.','.HOST_STATUS_NOT_MONITORED.','.HOST_STATUS_TEMPLATE.') '. - ' and h.hostid in ('.$accessible_hosts.') '. + ' and '.DBcondition('h.hostid',$available_hosts). ' group by h.hostid,h.host '. ' order by h.host'; } @@ -351,7 +351,7 @@ include_once "include/page_header.php"; $sql='select distinct h.hostid,h.host '. ' from hosts h '. ' where h.status in ('.HOST_STATUS_MONITORED.','.HOST_STATUS_NOT_MONITORED.','.HOST_STATUS_TEMPLATE.') '. - ' and h.hostid in ('.$accessible_hosts.') '. + ' and '.DBcondition('h.hostid',$available_hosts). ' group by h.hostid,h.host '. ' order by h.host'; } |