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/nodes.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/nodes.php')
| -rw-r--r-- | frontends/php/nodes.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/frontends/php/nodes.php b/frontends/php/nodes.php index c215251c..a499bd6e 100644 --- a/frontends/php/nodes.php +++ b/frontends/php/nodes.php @@ -56,12 +56,14 @@ include_once "include/page_header.php"; check_fields($fields); - $accessible_nodes = get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_LIST); + $accessible_nodes = get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_LIST,null,PERM_RES_IDS_ARRAY, get_current_nodeid(true)); - if(!in_array($ZBX_CURNODEID, explode(',',$accessible_nodes))) + if ( 0 == count($accessible_nodes) ) { access_deny(); } + + $accessible_nodes = implode(',', $accessible_nodes); ?> <?php if(isset($_REQUEST['save'])) @@ -118,9 +120,11 @@ include_once "include/page_header.php"; $table=new CTableInfo(S_NO_NODES_DEFINED); $table->SetHeader(array(S_ID,S_NAME,S_TYPE,S_TIME_ZONE,S_IP.':'.S_PORT)); - $db_nodes = DBselect('select * from nodes where nodeid in ('. - get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_LIST).') '. - ' order by nodetype desc, masterid, name '); + $db_nodes = DBselect( + 'select * from nodes '. + ' where nodeid in ('.$accessible_nodes.') '. + ' order by nodetype desc, masterid, name ' + ); while($row=DBfetch($db_nodes)) { |