tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the networkmap in the enterprise metaconsole.

This commit is contained in:
mdtrooper 2016-05-05 11:56:46 +02:00
parent 9a3525f544
commit 42dedd2d23
2 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_migration.php
View File

@ -20,10 +20,11 @@
* @package Include * @package Include
* @subpackage Migration * @subpackage Migration
*/ */
require_once("include/functions_maps.php");
function migration_open_networkmaps() { 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"); $old_networkmaps_open = db_get_all_rows_in_table("tnetwork_map");
foreach ($old_networkmaps_open as $old_netw_open) { foreach ($old_networkmaps_open as $old_netw_open) {

32
pandora_console/operation/maps/networkmap_list.php
View File

@ -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()) { if (enterprise_installed()) {
require_once ($config['homedir'].'/enterprise/include/functions_migration.php'); require_once ($config['homedir'].'/enterprise/include/functions_migration.php');
} }
$buttons['list'] = array('active' => true,
$buttons = array();
// Page header for metaconsole
if (enterprise_installed() && defined('METACONSOLE')) {
$buttons['list'] = array('active' => true,
'text' => '<a href="index.php?sec=screen&sec2=screens/screens&action=networkmap">' .
html_print_image("images/list.png", true,
array ('title' => __('List of networkmaps'))) .
'</a>');
// 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' => '<a href="index.php?sec=network&sec2=operation/maps/networkmap_list">' . 'text' => '<a href="index.php?sec=network&sec2=operation/maps/networkmap_list">' .
html_print_image("images/list.png", true, html_print_image("images/list.png", true,
array ('title' => __('List of networkmaps'))) . array ('title' => __('List of networkmaps'))) .
'</a>'); '</a>');
ui_print_page_header( ui_print_page_header(
__('Network map'), __('Network map'),
"images/op_network.png", "images/op_network.png",
false, false,
"network_map", "network_map",
false, false,
$buttons); $buttons);
}
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// It is dirty but at the moment (minor release is not) // It is dirty but at the moment (minor release is not)