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

New maps in progress... (Init migrate ntw maps enterprise)

This commit is contained in:
Arturo Gonzalez 2016-03-29 14:04:11 +02:00
parent 16812b55b5
commit 01d751505a
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_migration.php
View File

@ -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);
}
}

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

@ -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' => '<a href="index.php?sec=network&sec2=operation/maps/networkmap_list">' .
@ -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();
}
}
?>
<br />
<a href="index.php?sec=network&sec2=operation/maps/networkmap_list&migrate_open_networkmaps=1">(temp, this is for minor relases) migrate open networkmaps</a>
<br />
<br />
<br />
<a href="index.php?sec=network&sec2=operation/maps/networkmap_list&migrate_enterprise_networkmaps=1">(temp, this is for minor relases) migrate enterprise networkmaps</a>
<br />
<br />
<?php
////////////////////////////////////////////////////////////////////////
@ -141,8 +156,6 @@ if ($save_networkmap) {
$only_modules_with_alerts = (int) get_parameter('only_modules_with_alerts', 0);
$only_policy_modules = (int) get_parameter('only_policy_modules', 0);
$values = array();
$values['name'] = $name;
$values['id_user'] = $config['id_user'];
@ -157,7 +170,6 @@ if ($save_networkmap) {
$values['height'] = $height;
$values['source'] = $source;
$filter = array();
$filter['id_tag'] = $id_tag;
$filter['text'] = $text;