diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-13 08:22:32 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-13 08:22:32 +0000 |
| commit | abaab90a1c9d3367f1ef636557cfe8e661716749 (patch) | |
| tree | 3e266e5523a635c45a7e7ef6d4571e7323f26065 /frontends/php/graphs.php | |
| parent | 8901654871973b4267f106a97183001189189c82 (diff) | |
| download | zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.tar.gz zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.tar.xz zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.zip | |
- merger rev. 4546:4547 of branches/1.4.j [developed data monitoring of multiple nodes]
git-svn-id: svn://svn.zabbix.com/trunk@4549 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/graphs.php')
| -rw-r--r-- | frontends/php/graphs.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/graphs.php b/frontends/php/graphs.php index 55c42f7e..d3f858aa 100644 --- a/frontends/php/graphs.php +++ b/frontends/php/graphs.php @@ -95,7 +95,7 @@ include_once "include/page_header.php"; $_REQUEST['graph3d'] = get_request('graph3d', 0); $_REQUEST['legend'] = get_request('legend', 0); - $availiable_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY, null, null, $ZBX_CURNODEID); + $availiable_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY, null, null, get_current_nodeid()); $denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY, PERM_MODE_LT); // ---- <ACTIONS> ---- @@ -371,7 +371,7 @@ include_once "include/page_header.php"; " left join items i on gi.itemid=i.itemid ". " WHERE i.hostid=".$_REQUEST["hostid"]. " AND i.hostid not in (".$denyed_hosts.") ". - " AND ".DBid2nodeid("g.graphid")."=".$ZBX_CURNODEID. + ' and '.DBin_node('g.graphid'). " AND i.hostid is not NULL ". " ORDER BY g.name, g.graphid"); } @@ -379,7 +379,7 @@ include_once "include/page_header.php"; { $result = DBselect("SELECT distinct g.* FROM graphs g left join graphs_items gi on g.graphid=gi.graphid ". " left join items i on gi.itemid=i.itemid ". - " WHERE ".DBid2nodeid("g.graphid")."=".$ZBX_CURNODEID. + ' while '.DBin_node('g.graphid'). " AND ( i.hostid not in (".$denyed_hosts.") OR i.hostid is NULL )". " ORDER BY g.name, g.graphid"); } |