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

Some fixes in the generation of new networkmap from the source of old static networkmaps.

This commit is contained in:
mdtrooper 2016-05-13 14:18:33 +02:00
parent b229002dd7
commit 995187d02a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/class/Networkmap.class.php
View File

@ -311,16 +311,17 @@ class Networkmap extends Map {
$return['id_group'] = $this->source_group;
$return['simple'] = 0; // HARD CODED
$return['font_size'] = null;
$return['layout'] = null;
$return['font_size'] = 12; // HARD CODED
$return['layout'] = "radial"; // HARD CODED
$return['nooverlap'] = false; // HARD CODED
$return['zoom'] = 1; // HARD CODED
$return['ranksep'] = 2.5; // HARD CODED
$return['center'] = 0; // HARD CODED
$return['regen'] = 0; // HARD CODED
$return['regen'] = 1; // HARD CODED
$return['pure'] = 0; // HARD CODED
$return['id'] = $this->id;
$return['show_snmp_modules'] = $this->filter['only_snmp_modules'];
$return['cut_names'] = 0; // HARD CODED
$return['l2_network_interfaces'] = true; // HARD CODED
$return['ip_mask'] = $this->source_ip_mask;
$return['dont_show_subgroups'] = false;
@ -377,7 +378,7 @@ class Networkmap extends Map {
$parameters['pure'],
$parameters['id'],
$parameters['show_snmp_modules'],
false, //cut_names
$parameters['cut_names'],
true, // relative
$this->filter['text'],
'mix_l2_l3',

2
pandora_console/include/functions_migration.php
View File

@ -79,7 +79,7 @@ function migration_open_networkmaps() {
$filter['show_agents'] = 1;
break;
case 'all':
$filter['show_modules'] = 1;
$filter['show_modules'] = 0;
$filter['show_agents'] = 1;
break;
case 'groups':