New networkmaps in progress... (Fixed other types of generation)
This commit is contained in:
parent
e3a6fada7f
commit
bda0584131
|
@ -257,7 +257,6 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
|
|||
$old_mode = false) {
|
||||
|
||||
global $config;
|
||||
|
||||
$nooverlap = 1;
|
||||
|
||||
$parents = array();
|
||||
|
|
|
@ -75,15 +75,14 @@ function networkmap_process_networkmap($id = 0) {
|
|||
$show_snmp_modules = false;
|
||||
$dont_show_subgroups = false;
|
||||
|
||||
$id_group = -666;
|
||||
$id_group = $networkmap['id_group'];;
|
||||
$ip_mask = "";
|
||||
switch ($networkmap['source']) {
|
||||
case 0:
|
||||
$id_group = $networkmap['id_group'];
|
||||
break;
|
||||
case 1:
|
||||
$recon_task = db_get_row_filter('trecon_task',
|
||||
array('id_rt' => $networkmap['source_data']));
|
||||
|
||||
$ip_mask = $recon_task['field1'];
|
||||
break;
|
||||
case 2:
|
||||
$ip_mask = $networkmap['source_data'];
|
||||
|
|
|
@ -233,7 +233,7 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
|
|||
$filter['node_radius'] = $node_radius;
|
||||
|
||||
$values['filter'] = json_encode($filter);
|
||||
html_debug($values);
|
||||
|
||||
$result = false;
|
||||
if (!empty($name)) {
|
||||
$result = db_process_sql_update('tmap',
|
||||
|
|
Loading…
Reference in New Issue