diff --git a/pandora_console/include/functions_migration.php b/pandora_console/include/functions_migration.php index 714fb8b3d0..c01bc91565 100644 --- a/pandora_console/include/functions_migration.php +++ b/pandora_console/include/functions_migration.php @@ -26,8 +26,6 @@ require_once("include/functions_maps.php"); function migration_open_networkmaps() { $old_networkmaps_open = db_get_all_rows_in_table("tnetwork_map"); - html_debug($old_networkmaps_open); - foreach ($old_networkmaps_open as $old_netw_open) { $new_networkmap = array(); @@ -65,7 +63,6 @@ function migration_open_networkmaps() { break; } - // ---- Filter ------------------------------------------------- $filter = array(); @@ -110,10 +107,6 @@ function migration_open_networkmaps() { $new_networkmap['filter'] = json_encode($filter); // ------------------------------------------------------------- - - - html_debug($new_networkmap); - maps_save_map($new_networkmap); } } diff --git a/pandora_console/operation/maps/networkmap_list.php b/pandora_console/operation/maps/networkmap_list.php index 0a6ad393bb..3806eb7f23 100644 --- a/pandora_console/operation/maps/networkmap_list.php +++ b/pandora_console/operation/maps/networkmap_list.php @@ -37,6 +37,9 @@ if (!$networkmaps_read && !$networkmaps_write && !$networkmaps_manage) { } require_once('include/functions_migration.php'); +if (enterprise_installed()) { + require_once ($config['homedir'].'/enterprise/include/functions_migration.php'); +} $buttons['list'] = array('active' => true, 'text' => '' . @@ -58,15 +61,27 @@ ui_print_page_header( //////////////////////////////////////////////////////////////////////// $migrate_open_networkmaps = (int)get_parameter('migrate_open_networkmaps'); +$migrate_enterprise_networkmaps = (int)get_parameter('migrate_enterprise_networkmaps'); -if ($migrate_open_networkmaps) +if ($migrate_open_networkmaps) { migration_open_networkmaps(); +} +if (enterprise_installed()) { + if ($migrate_enterprise_networkmaps) { + migration_enterprise_networkmaps(); + } +} ?>
(temp, this is for minor relases) migrate open networkmaps

+ +
+(temp, this is for minor relases) migrate enterprise networkmaps +
+