diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-16 15:04:32 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-16 15:04:32 +0000 |
| commit | f3967e0cbce7a281609d1c07cffe374b737c1134 (patch) | |
| tree | cdefff7e4fe9c7e35db78c0e9209934bf82c0b9f /frontends/php/include/page_header.php | |
| parent | b3f600707257189a14794329cc15bf51bc60ea57 (diff) | |
| download | zabbix-f3967e0cbce7a281609d1c07cffe374b737c1134.tar.gz zabbix-f3967e0cbce7a281609d1c07cffe374b737c1134.tar.xz zabbix-f3967e0cbce7a281609d1c07cffe374b737c1134.zip | |
- [DEV-137] fixes to DM setup (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5771 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/page_header.php')
| -rw-r--r-- | frontends/php/include/page_header.php | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php index 4640657f..8cbcc843 100644 --- a/frontends/php/include/page_header.php +++ b/frontends/php/include/page_header.php @@ -321,7 +321,7 @@ COpt::profiling_start("page"); } } - if ( isset($page_exist) && + if (isset($page_exist) && ( isset($sub['forse_disable_subnodes']) || isset($sub_pages['forse_disable_subnodes']) ) && !defined('ZBX_DISABLE_SUBNODES')) { @@ -494,29 +494,23 @@ COpt::compare_files_with_menu($ZBX_MENU); $node_form = null; - if(ZBX_DISTRIBUTED) - { + if(ZBX_DISTRIBUTED){ $lst_nodes = new CComboBox('switch_node', get_current_nodeid(false), "submit()"); - $db_nodes = DBselect( - 'select * from nodes '. - ' where nodeid in ('. - get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_LIST). - ') '. - ' order by name ' + $db_nodes = DBselect('SELECT * '. + ' FROM nodes '. + ' WHERE nodeid IN ('.get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_LIST).') '. + ' ORDER BY name ' ); - while($node_data = DBfetch($db_nodes)) - { + while($node_data = DBfetch($db_nodes)){ $lst_nodes->AddItem($node_data['nodeid'],$node_data['name']); } - if( $lst_nodes->ItemsCount() > 1 ) - { + if($lst_nodes->ItemsCount() > 1){ $node_form = new CForm(); $node_form->AddItem(array(S_CURRENT_NODE,$lst_nodes)); unset($lst_nodes); - if ( !defined('ZBX_DISABLE_SUBNODES') ) - { + if(!defined('ZBX_DISABLE_SUBNODES')){ global $ZBX_WITH_SUBNODES; $cmd_show_subnodes = new CComboBox('show_subnodes', !empty($ZBX_WITH_SUBNODES) ? 1 : 0, "submit()"); |