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/popup_trexpr.php | |
| parent | 6db9d7bcf88b79ab279dd2b5dc929fabb1a23f1f (diff) | |
| download | zabbix-5c3768ceaa3080321c3bf6481640fcdd380d0025.tar.gz zabbix-5c3768ceaa3080321c3bf6481640fcdd380d0025.tar.xz zabbix-5c3768ceaa3080321c3bf6481640fcdd380d0025.zip | |
- [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/popup_trexpr.php')
| -rw-r--r-- | frontends/php/popup_trexpr.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/frontends/php/popup_trexpr.php b/frontends/php/popup_trexpr.php index 27e9e69f..c7997b90 100644 --- a/frontends/php/popup_trexpr.php +++ b/frontends/php/popup_trexpr.php @@ -183,12 +183,12 @@ include_once "include/page_header.php"; $dstfld1 = get_request("dstfld1", ''); // destination field $itemid = get_request("itemid", 0); - $available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY); + $available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,PERM_RES_IDS_ARRAY); if($item_data = DBfetch(DBselect('SELECT DISTINCT h.host,i.* '. ' FROM hosts h,items i '. ' WHERE h.hostid=i.hostid '. - ' AND h.hostid IN ('.$available_hosts.') '. + ' AND '.DBcondition('h.hostid',$available_hosts). ' AND i.itemid='.$itemid))) { $description = $item_data['host'].':'.item_description($item_data["description"],$item_data["key_"]); @@ -199,8 +199,7 @@ include_once "include/page_header.php"; } $expr_type = get_request("expr_type", 'last[=]'); - if(eregi('^([a-z]{1,})\[(['.implode('',array_keys($operators)).'])\]$',$expr_type,$expr_res)) - { + if(eregi('^([a-z]{1,})\[(['.implode('',array_keys($operators)).'])\]$',$expr_type,$expr_res)){ $function = $expr_res[1]; $operator = $expr_res[2]; |