diff --git a/pandora_console/include/functions_migration.php b/pandora_console/include/functions_migration.php index c01bc91565..7541cf22aa 100644 --- a/pandora_console/include/functions_migration.php +++ b/pandora_console/include/functions_migration.php @@ -20,10 +20,11 @@ * @package Include * @subpackage Migration */ - -require_once("include/functions_maps.php"); - function migration_open_networkmaps() { + global $config; + + require_once($config['homedir'] . "/include/functions_maps.php"); + $old_networkmaps_open = db_get_all_rows_in_table("tnetwork_map"); foreach ($old_networkmaps_open as $old_netw_open) { diff --git a/pandora_console/operation/maps/networkmap_list.php b/pandora_console/operation/maps/networkmap_list.php index f7aafde16a..96de07c18d 100644 --- a/pandora_console/operation/maps/networkmap_list.php +++ b/pandora_console/operation/maps/networkmap_list.php @@ -36,24 +36,50 @@ if (!$networkmaps_read && !$networkmaps_write && !$networkmaps_manage) { } } -require_once('include/functions_migration.php'); +require_once($config['homedir'] .'/include/functions_migration.php'); +require_once($config['homedir'] .'/include/functions_maps.php'); + if (enterprise_installed()) { require_once ($config['homedir'].'/enterprise/include/functions_migration.php'); } -$buttons['list'] = array('active' => true, - 'text' => '' . - html_print_image("images/list.png", true, - array ('title' => __('List of networkmaps'))) . - ''); -ui_print_page_header( - __('Network map'), - "images/op_network.png", - false, - "network_map", - false, - $buttons); +$buttons = array(); + +// Page header for metaconsole +if (enterprise_installed() && defined('METACONSOLE')) { + $buttons['list'] = array('active' => true, + 'text' => '' . + html_print_image("images/list.png", true, + array ('title' => __('List of networkmaps'))) . + ''); + + // Bread crumbs + ui_meta_add_breadcrumb( + array('link' => + 'index.php?sec=screen&sec2=screens/screens&action=networkmap', + 'text' => __('Network map'))); + + ui_meta_print_page_header($nav_bar); + + //Print header + ui_meta_print_header(__('Network map'), "", $buttons); +} +else { + $buttons['list'] = array('active' => true, + 'text' => '' . + html_print_image("images/list.png", true, + array ('title' => __('List of networkmaps'))) . + ''); + + ui_print_page_header( + __('Network map'), + "images/op_network.png", + false, + "network_map", + false, + $buttons); +} //////////////////////////////////////////////////////////////////////// // It is dirty but at the moment (minor release is not)