diff --git a/pandora_console/include/class/Networkmap.class.php b/pandora_console/include/class/Networkmap.class.php index d51e62121a..93d4312254 100644 --- a/pandora_console/include/class/Networkmap.class.php +++ b/pandora_console/include/class/Networkmap.class.php @@ -21,12 +21,6 @@ * @subpackage Networkmap */ -require_once ('include/functions_os.php'); -require_once ('include/functions_networkmap.php'); -enterprise_include("include/functions_networkmap_enterprise.php"); - -require_once("include/class/Map.class.php"); - class Networkmap extends Map { protected $filter = array(); @@ -34,6 +28,12 @@ class Networkmap extends Map { protected $source_ip_mask = ""; public function __construct($id) { + global $config; + + require_once($config['homedir'] . '/include/functions_os.php'); + require_once($config['homedir'] . '/include/functions_networkmap.php'); + enterprise_include_once("include/functions_networkmap_enterprise.php"); + parent::__construct($id); $this->requires_js[] = "include/javascript/map/NetworkmapController.js"; diff --git a/pandora_console/operation/maps/networkmap.php b/pandora_console/operation/maps/networkmap.php index 648dc136bc..0d9a7ed691 100644 --- a/pandora_console/operation/maps/networkmap.php +++ b/pandora_console/operation/maps/networkmap.php @@ -38,44 +38,84 @@ if (!$networkmaps_read && !$networkmaps_write && !$networkmaps_manage) { $id = (int)get_parameter('id', 0); -require_once('include/functions_migration.php'); -require_once('include/class/Networkmap.class.php'); +require_once($config['homedir'] . '/include/functions_migration.php'); +require_once($config['homedir'] . '/include/class/Map.class.php'); +require_once($config['homedir'] . '/include/class/Networkmap.class.php'); enterprise_include('include/class/NetworkmapEnterprise.class.php'); //~ require_once('include/browscap/php-local-browscap.php'); - -$buttons['list'] = array('active' => false, +if (is_metaconsole()) { + $buttons['list'] = array('active' => true, + 'text' => '' . + html_print_image("images/list.png", true, + array ('title' => __('List of networkmaps'))) . + ''); + + $title_header = __('Network map » %s', Map::getName($id)); + + $buttons['edit'] = array('active' => true, + 'text' => '' . + html_print_image("images/cog.png", true, + array ('title' => __('Edit networkmap'))) . + ''); + if (enterprise_installed()) { + $buttons['deleted'] = array('active' => false, + 'text' => '' . + html_print_image("images/list.png", true, + array ('title' => __('Deleted list'))) . + ''); + } + $buttons['networkmap'] = array('active' => false, + 'text' => '' . + html_print_image("images/op_network.png", true, + array ('title' => __('View networkmap'))) . + ''); + + // Bread crumbs + ui_meta_add_breadcrumb( + array('link' => + 'index.php?sec=screen&sec2=screens/screens&action=networkmap', + 'text' => $title_header)); + + ui_meta_print_page_header($nav_bar); + + //Print header + ui_meta_print_header($title_header, "", $buttons); +} +else { + $buttons['list'] = array('active' => false, 'text' => '' . html_print_image("images/list.png", true, array ('title' => __('List of networkmaps'))) . ''); -$buttons['edit'] = array('active' => false, - 'text' => '' . - html_print_image("images/cog.png", true, - array ('title' => __('Edit networkmap'))) . - ''); -if (enterprise_installed()) { - $buttons['deleted'] = array('active' => false, - 'text' => '' . - html_print_image("images/list.png", true, - array ('title' => __('Deleted list'))) . + $buttons['edit'] = array('active' => false, + 'text' => '' . + html_print_image("images/cog.png", true, + array ('title' => __('Edit networkmap'))) . + ''); + if (enterprise_installed()) { + $buttons['deleted'] = array('active' => false, + 'text' => '' . + html_print_image("images/list.png", true, + array ('title' => __('Deleted list'))) . + ''); + } + $buttons['networkmap'] = array('active' => true, + 'text' => '' . + html_print_image("images/op_network.png", true, + array ('title' => __('View networkmap'))) . ''); + + ui_print_page_header( + __('Network map » %s', Map::getName($id)), + "images/op_network.png", + false, + "network_map", + false, + $buttons); } -$buttons['networkmap'] = array('active' => true, - 'text' => '' . - html_print_image("images/op_network.png", true, - array ('title' => __('View networkmap'))) . - ''); - -ui_print_page_header( - __('Network map » %s', Map::getName($id)), - "images/op_network.png", - false, - "network_map", - false, - $buttons); if (empty($id)) { ui_print_error_message(__('Not found networkmap.')); diff --git a/pandora_console/operation/maps/networkmap_list.php b/pandora_console/operation/maps/networkmap_list.php index 7ce3bfa875..cd92d4f9e2 100644 --- a/pandora_console/operation/maps/networkmap_list.php +++ b/pandora_console/operation/maps/networkmap_list.php @@ -406,12 +406,17 @@ else { foreach ($networkmaps as $networkmap) { $data = array(); - $data['name'] = $networkmap['name']; - - $data['name'] = '' . + 'id=' . $networkmap['id']; + if (is_metaconsole()) { + $url_networkmap = 'index.php?' . + 'sec=screen&sec2=screens/screens&' . + 'action=networkmap&id=' . $networkmap['id']; + } + + $data['name'] = '' . $networkmap['name'] . ''; $data['type'] = maps_get_subtype_string($networkmap['subtype']);