diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-20 14:46:11 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-20 14:46:11 +0000 |
| commit | 469d17e7d448ec1833abb72add88d1d1f61c4a06 (patch) | |
| tree | 4a21e42405a82385c87981d5f2199e388a964272 /frontends/php/popup.php | |
| parent | 155fa1457186f7ffa453ba7bf68ae0c22387746b (diff) | |
| download | zabbix-master.tar.gz zabbix-master.tar.xz zabbix-master.zip | |
- [DEV-137] many small fixes (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5932 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/popup.php')
| -rw-r--r-- | frontends/php/popup.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/frontends/php/popup.php b/frontends/php/popup.php index 1df0f8a1..4932714b 100644 --- a/frontends/php/popup.php +++ b/frontends/php/popup.php @@ -524,10 +524,11 @@ include_once "include/page_header.php"; $table = new CTableInfo(S_NO_GROUPS_DEFINED); $table->SetHeader(array(S_NAME)); - $db_groups = DBselect("SELECT DISTINCT groupid,name from groups ". - ' where '.DBin_node('groupid', $nodeid). - " AND groupid in (".$available_groups.") ". - " order by name"); + $db_groups = DBselect('SELECT DISTINCT groupid,name '. + ' FROM groups '. + ' WHERE '.DBin_node('groupid', $nodeid). + ' AND '.DBcondition('groupid',$available_groups). + ' ORDER BY name'); while($row = DBfetch($db_groups)){ $name = new CLink($row["name"],"#","action"); if(isset($_REQUEST['reference']) && ($_REQUEST['reference'] =='dashboard')){ @@ -1273,7 +1274,7 @@ include_once "include/page_header.php"; $db_groups = DBselect('SELECT DISTINCT n.name as node_name,g.groupid,g.name,n.nodeid '. ' FROM hosts_groups hg, groups g '. ' LEFT JOIN nodes n ON n.nodeid='.DBid2nodeid('g.groupid'). - ' WHERE g.groupid IN ('.$available_groups.') '. + ' WHERE '.DBcondition('g.groupid',$available_groups). ' AND '.DBin_node('g.groupid',$nodeid). ' ORDER BY n.nodeid,g.name'); |