New networkmaps in progress... (To much changes in the maps form and more minor things)
This commit is contained in:
Arturo Gonzalez
parent
b3ffb01b85
commit
e3a6fada7f
|
|
@ -1688,8 +1688,8 @@ function html_print_radio_button_extended ($name, $value, $label, $checkedvalue,
|
|||
*
|
||||
* @return string HTML code if return parameter is true.
|
||||
*/
|
||||
function html_print_radio_button ($name, $value, $label = '', $checkedvalue = '', $return = false) {
|
||||
$output = html_print_radio_button_extended ($name, $value, $label, $checkedvalue, false, '', '', true);
|
||||
function html_print_radio_button ($name, $value, $label = '', $checkedvalue = '', $return = false, $disabled = false) {
|
||||
$output = html_print_radio_button_extended ($name, $value, $label, $checkedvalue, $disabled, '', '', true);
|
||||
|
||||
if ($return)
|
||||
return $output;
|
||||
|
|
|
|||
|
|
@ -333,6 +333,12 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
|
|||
else if ($group == -666) {
|
||||
$agents = false;
|
||||
}
|
||||
else if (!empty($ip_mask)) {
|
||||
$agents = networkmap_get_new_nodes_from_ip_mask($ip_mask,
|
||||
array ('id_grupo, nombre, id_os, id_parent, id_agente,
|
||||
normal_count, warning_count, critical_count,
|
||||
unknown_count, total_count, notinit_count'), $strict_user);
|
||||
}
|
||||
else {
|
||||
if ($strict_user) {
|
||||
$filter['group_by'] = 'tagente.id_agente';
|
||||
|
|
|
|||
|
|
@ -57,14 +57,10 @@ function networkmap_process_networkmap($id = 0) {
|
|||
$layout = "radial";
|
||||
break;
|
||||
case 3:
|
||||
$filter = "neato";
|
||||
$layout = "neato";
|
||||
break;
|
||||
case 4:
|
||||
$filter = "neato";
|
||||
$layout = "spring1";
|
||||
break;
|
||||
case 5:
|
||||
case 4:
|
||||
$filter = "fdp";
|
||||
$layout = "spring2";
|
||||
break;
|
||||
|
|
@ -88,8 +84,9 @@ function networkmap_process_networkmap($id = 0) {
|
|||
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'];
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -224,13 +221,14 @@ function networkmap_process_networkmap($id = 0) {
|
|||
$index++;
|
||||
}
|
||||
|
||||
$center = array('x' => 500, 'y' => 500);
|
||||
|
||||
if (enterprise_installed()) {
|
||||
enterprise_include_once("include/functions_pandora_networkmap.php");
|
||||
$center = save_generate_nodes($id, &$nodes_and_relations);
|
||||
save_generate_nodes($id, &$nodes_and_relations);
|
||||
}
|
||||
|
||||
$pandorafms_node = $nodes_and_relations['nodes'][0];
|
||||
$center = array('x' => $pandorafms_node['x'], 'y' => $pandorafms_node['y']);
|
||||
|
||||
$networkmap['center_x'] = $center['x'];
|
||||
$networkmap['center_y'] = $center['y'];
|
||||
db_process_sql_update('tmap',
|
||||
|
|
@ -578,6 +576,8 @@ function networkmap_write_js_array($id, $nodes_and_relations = array()) {
|
|||
|
||||
echo "var enterprise_installed = " . $ent_installed . ";\n";
|
||||
|
||||
echo "var node_radius = " . $networkmap['filter']['node_radius'] . ";\n";
|
||||
|
||||
echo "var networkmap_holding_area_dimensions = " .
|
||||
json_encode($networkmap['filter']['holding_area']) . ";\n";
|
||||
|
||||
|
|
@ -1154,6 +1154,7 @@ function show_networkmap($id = 0, $user_readonly = false, $nodes_and_relations =
|
|||
networkmap_center: networkmap_center,
|
||||
networkmap_dimensions: networkmap_dimensions,
|
||||
enterprise_installed: enterprise_installed,
|
||||
node_radius: node_radius,
|
||||
holding_area_dimensions: networkmap_holding_area_dimensions,
|
||||
url_background_grid: url_background_grid
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1891,6 +1891,9 @@ function init_graph(parameter_object) {
|
|||
window.translation = [0, 0];
|
||||
window.scale = 0.6;
|
||||
window.node_radius = 40;
|
||||
if (typeof(parameter_object.node_radius) != "undefined") {
|
||||
window.node_radius = parameter_object.node_radius;
|
||||
}
|
||||
window.interface_radius = 5;
|
||||
window.disabled_drag_zoom = false;
|
||||
window.key_multiple_selection = 17; //CTRL key
|
||||
|
|
@ -2170,19 +2173,7 @@ function init_graph(parameter_object) {
|
|||
.attr("transform",
|
||||
"translate(" + translation + ")scale(" + scale + ")");
|
||||
|
||||
window.layer_graph.append("rect")
|
||||
.attr("id", "background_size_networkmap")
|
||||
.attr("width", networkmap_dimensions[0] + node_radius)
|
||||
.attr("height", networkmap_dimensions[1] + node_radius)
|
||||
.attr("x", rect_center_x - (networkmap_dimensions[0] / 2))
|
||||
.attr("y", rect_center_y - (networkmap_dimensions[1] / 2))
|
||||
.attr("style", "fill: url(#background_grid); " +
|
||||
"stroke: #960000; " +
|
||||
"stroke-width: 2; " +
|
||||
"stroke-miterlimit: 4; " +
|
||||
"stroke-opacity: 1; " +
|
||||
"stroke-dasharray: none;")
|
||||
.on("contextmenu", function(d) { show_menu("background", d);});
|
||||
|
||||
|
||||
if (enterprise_installed) {
|
||||
window.layer_graph.append("rect")
|
||||
|
|
@ -2193,14 +2184,13 @@ function init_graph(parameter_object) {
|
|||
networkmap_dimensions[0] + node_radius - holding_area_dimensions[0])
|
||||
.attr("y",
|
||||
networkmap_dimensions[1] + node_radius - holding_area_dimensions[1])
|
||||
.attr("style", "fill: #ddd; " +
|
||||
.attr("style", "fill: #efefef; " +
|
||||
"fill-opacity: 0.75; " +
|
||||
"stroke: #00ff00; " +
|
||||
"stroke-width: 4; " +
|
||||
"stroke: #dedede; " +
|
||||
"stroke-width: 1; " +
|
||||
"stroke-miterlimit: 4; " +
|
||||
"stroke-opacity: 1; " +
|
||||
"stroke-opacity: 0.75; " +
|
||||
"stroke-dasharray: none; " +
|
||||
"stroke-dasharray: 12,3; " +
|
||||
"stroke-dashoffset: 0");
|
||||
|
||||
window.layer_graph.append("text")
|
||||
|
|
@ -2219,7 +2209,7 @@ function init_graph(parameter_object) {
|
|||
"stroke: none; " +
|
||||
"font-family: Sans")
|
||||
.attr("x", networkmap_dimensions[0] + node_radius - holding_area_dimensions[0])
|
||||
.attr("y", networkmap_dimensions[1] + node_radius - holding_area_dimensions[1])
|
||||
.attr("y", networkmap_dimensions[1] + node_radius - holding_area_dimensions[1] - 10)
|
||||
.text(holding_area_title);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,110 +16,6 @@ global $config;
|
|||
// Check user credentials
|
||||
check_login();
|
||||
|
||||
if (is_ajax ()) {
|
||||
$resize_networkmap = (bool)get_parameter(
|
||||
'resize_networkmap', false);
|
||||
|
||||
if ($resize_networkmap) {
|
||||
$id = (int) get_parameter('id', 0);
|
||||
|
||||
$return = array();
|
||||
$return['correct'] = false;
|
||||
|
||||
$id_group = db_get_value('id_group', 'tmap', 'id', $id);
|
||||
// ACL for the network map
|
||||
// $networkmap_read = check_acl ($config['id_user'], $id_group, "MR");
|
||||
$networkmap_write = check_acl ($config['id_user'], $id_group, "MW");
|
||||
$networkmap_manage = check_acl ($config['id_user'], $id_group, "MM");
|
||||
|
||||
if (!$networkmap_write && !$networkmap_manage) {
|
||||
db_pandora_audit("ACL Violation",
|
||||
"Trying to access networkmap");
|
||||
echo json_encode($return);
|
||||
return;
|
||||
}
|
||||
|
||||
$min_x = db_get_sql('SELECT MIN(x)
|
||||
FROM titem
|
||||
WHERE id_map = ' . $id . ';');
|
||||
|
||||
$min_x_options = db_get_sql('SELECT style
|
||||
FROM titem
|
||||
WHERE id_map = ' . $id . '
|
||||
ORDER BY x ASC LIMIT 1;');
|
||||
|
||||
$min_x_options = json_decode($min_x_options, true);
|
||||
$min_x = $min_x - $min_x_options['width'] - 10; //For prevent the exit icons of networkmap, -10 for the text
|
||||
|
||||
|
||||
$min_y = db_get_sql('SELECT MIN(y)
|
||||
FROM titem
|
||||
WHERE id_map = ' . $id . ';');
|
||||
|
||||
$min_y_options = db_get_sql('SELECT style
|
||||
FROM titem
|
||||
WHERE id_map = ' . $id . '
|
||||
ORDER BY y ASC LIMIT 1;');
|
||||
|
||||
$min_y_options = json_decode($min_y_options, true);
|
||||
$min_y = $min_y - $min_y_options['height'] - 10; //For prevent the exit icons of networkmap, -10 for the text
|
||||
|
||||
$result = db_process_sql('UPDATE titem
|
||||
SET x = x - ' . $min_x . ', y = y - ' . $min_y . '
|
||||
WHERE id_map = ' . $id . ';');
|
||||
|
||||
if ($result !== false) {
|
||||
$max_x = db_get_sql('SELECT MAX(x)
|
||||
FROM titem
|
||||
WHERE id_map = ' . $id . ';');
|
||||
|
||||
$max_x_options = db_get_sql('SELECT style
|
||||
FROM titem
|
||||
WHERE id_map = ' . $id . '
|
||||
ORDER BY x DESC LIMIT 1;');
|
||||
|
||||
$max_x_options = json_decode($max_x_options, true);
|
||||
$max_x = $max_x + $max_x_options['width'] + 10; //For prevent the exit icons of networkmap, +10 for the text
|
||||
|
||||
|
||||
$max_y = db_get_sql('SELECT MAX(y)
|
||||
FROM titem
|
||||
WHERE tmap = ' . $id . ';');
|
||||
|
||||
$max_y_options = db_get_sql('SELECT style
|
||||
FROM titem
|
||||
WHERE tmap = ' . $id . '
|
||||
ORDER BY y DESC LIMIT 1;');
|
||||
|
||||
$max_y_options = json_decode($max_y_options, true);
|
||||
$max_y = $max_y + $max_y_options['height'] + 10; //For prevent the exit icons of networkmap, +10 for the text
|
||||
|
||||
|
||||
$options_w = db_get_value_filter('width',
|
||||
'tmap', array('id' => $id));
|
||||
$options_h = db_get_value_filter('height',
|
||||
'tmap', array('id' => $id));
|
||||
|
||||
$options_w = $max_x;
|
||||
$options_h = $max_y;
|
||||
|
||||
$result = db_process_sql_update('tmap',
|
||||
array('width' => $options_w, 'height' => $options_h),
|
||||
array('id' => $id));
|
||||
|
||||
if ($result) {
|
||||
$return['correct'] = true;
|
||||
$return['width'] = $max_x;
|
||||
$return['height'] = $max_y;
|
||||
}
|
||||
}
|
||||
|
||||
echo json_encode($return);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
$id = (int) get_parameter('id_networkmap', 0);
|
||||
|
||||
$new_networkmap = (bool) get_parameter('new_networkmap', false);
|
||||
|
|
@ -135,23 +31,20 @@ if (empty($id)) {
|
|||
if ($new_networkmap) {
|
||||
$name = '';
|
||||
$id_group = 0;
|
||||
$width = 3000;
|
||||
$height = 3000;
|
||||
$node_radius = 40;
|
||||
$description = "";
|
||||
$method = 'twopi';
|
||||
$refresh_value = 60 * 5;
|
||||
$l2_network_interfaces = true;
|
||||
// --------- DEPRECATED ----------------------------------------
|
||||
$old_mode = false;
|
||||
// --------- END DEPRECATED ------------------------------------
|
||||
$recon_task_id = 0;
|
||||
$source_data = 'group';
|
||||
$source = 'group';
|
||||
$ip_mask = '';
|
||||
$dont_show_subgroups = false;
|
||||
}
|
||||
|
||||
$disabled_generation_method_select = false;
|
||||
$disabled_source = false;
|
||||
if ($edit_networkmap) {
|
||||
$disabled_generation_method_select = true;
|
||||
$disabled_source = true;
|
||||
|
||||
$values = db_get_row('tmap', 'id', $id);
|
||||
|
||||
|
|
@ -175,11 +68,26 @@ if ($edit_networkmap) {
|
|||
}
|
||||
|
||||
$name = io_safe_output($values['name']);
|
||||
|
||||
|
||||
$description = $values['description'];
|
||||
|
||||
$filter = json_decode($values['filter'], true);
|
||||
|
||||
$node_radius = $filter['node_radius'];
|
||||
|
||||
$source = $values['source'];
|
||||
switch ($source) {
|
||||
case 0:
|
||||
$source = 'group';
|
||||
break;
|
||||
case 1:
|
||||
$source = 'recon_task';
|
||||
break;
|
||||
case 2:
|
||||
$source = 'ip_mask';
|
||||
break;
|
||||
}
|
||||
$source_data = $values['source_data'];
|
||||
$width = $values['width'];
|
||||
$height = $values['height'];
|
||||
switch ($values['generation_method']) {
|
||||
case 0:
|
||||
$method = "circo";
|
||||
|
|
@ -200,19 +108,6 @@ if ($edit_networkmap) {
|
|||
$method = "fdp";
|
||||
break;
|
||||
}
|
||||
$refresh_value = $values['source_period'];
|
||||
$l2_network_interfaces = true;
|
||||
/* NO CONTEMPLADO
|
||||
if (isset($options['l2_network_interfaces']))
|
||||
$l2_network_interfaces = $options['l2_network_interfaces'];
|
||||
*/
|
||||
// --------- DEPRECATED ----------------------------------------
|
||||
$old_mode = false;
|
||||
/* NO CONTEMPLADO
|
||||
if (isset($options['old_mode']))
|
||||
$old_mode = (bool)$options['old_mode'];
|
||||
*/
|
||||
// --------- END DEPRECATED ------------------------------------
|
||||
$recon_task_id = 0;
|
||||
if ($values['source'] == 1) {
|
||||
$recon_task_id = $values['source_data'];
|
||||
|
|
@ -225,10 +120,8 @@ if ($edit_networkmap) {
|
|||
}
|
||||
|
||||
$dont_show_subgroups = false;
|
||||
/* NO CONTEMPLADO
|
||||
if (isset($options['dont_show_subgroups']))
|
||||
$dont_show_subgroups = $options['dont_show_subgroups'];
|
||||
*/
|
||||
if (isset($filter['dont_show_subgroups']))
|
||||
$dont_show_subgroups = $filter['dont_show_subgroups'];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -255,6 +148,7 @@ else {
|
|||
WHERE id_recon_script = ' . $id_snmp_l2_recon);
|
||||
$result = db_get_all_rows_sql ($sql);
|
||||
}
|
||||
|
||||
$list_recon_tasks = array();
|
||||
if (!empty($result)) {
|
||||
foreach ($result as $item) {
|
||||
|
|
@ -288,64 +182,35 @@ else {
|
|||
$table->data[1][1] = html_print_select_groups(false, "AR", true,
|
||||
'id_group', $id_group, '', '', 0, true);
|
||||
|
||||
$table->data['source_data'][0] = __('Source data');
|
||||
$table->data['source_data'][1] =
|
||||
html_print_radio_button('source_data', 'group', __('Group'), $source_data, true) .
|
||||
html_print_radio_button('source_data', 'recon_task', __('Recon task'), $source_data, true) .
|
||||
html_print_radio_button('source_data', 'ip_mask', __('CIDR IP mask'), $source_data, true);
|
||||
|
||||
// --------- DEPRECATED --------------------------------------------
|
||||
$table->data['old_mode'][0] =
|
||||
__('Generate networkmap with parents relationships') .
|
||||
ui_print_help_tip(
|
||||
__('This feature is deprecated, be careful because in the next releases it will be disappear.'), true);
|
||||
|
||||
$table->data['old_mode'][1] =
|
||||
html_print_checkbox('old_mode', '1', $old_mode, true);
|
||||
// --------- END DEPRECATED ----------------------------------------
|
||||
|
||||
$table->data['source_data'][1] .=
|
||||
html_print_input_hidden('l2_network_interfaces', 1, true);
|
||||
$table->data[2][0] = __('Node radius');
|
||||
$table->data[2][1] = html_print_input_text ('node_radius', $node_radius, '', 2,
|
||||
10,true);
|
||||
|
||||
$table->data[3][0] = __('Description');
|
||||
$table->data[3][1] = html_print_textarea ('description', 7, 25, $description, '', true);
|
||||
|
||||
$table->data['source'][0] = __('Source');
|
||||
$table->data['source'][1] =
|
||||
html_print_radio_button('source', 'group', __('Group'), $source, true, $disabled_source) .
|
||||
html_print_radio_button('source', 'recon_task', __('Recon task'), $source, true, $disabled_source) .
|
||||
html_print_radio_button('source', 'ip_mask', __('CIDR IP mask'), $source, true, $disabled_source);
|
||||
|
||||
$table->data['source_data_recon_task'][0] = __('Source from recon task');
|
||||
$table->data['source_data_recon_task'][0] .= ui_print_help_tip(
|
||||
__('It is setted any recon task, the nodes get from the recontask IP mask instead from the group.'), true);
|
||||
$table->data['source_data_recon_task'][1] = html_print_select(
|
||||
$list_recon_tasks, 'recon_task_id', $recon_task_id, '', __('None'), 0, true);
|
||||
$list_recon_tasks, 'recon_task_id', $recon_task_id, '', __('None'), 0, true, false, true, '', $disabled_source);
|
||||
$table->data['source_data_recon_task'][1] .= ui_print_help_tip(
|
||||
__('Show only the task with the recon script "SNMP L2 Recon".'), true);
|
||||
|
||||
|
||||
$table->data['source_data_ip_mask'][0] = __('Source from CIDR IP mask');
|
||||
$table->data['source_data_ip_mask'][1] =
|
||||
html_print_input_text('ip_mask', $ip_mask, '', 20, 255, true);
|
||||
html_print_input_text('ip_mask', $ip_mask, '', 20, 255, true, $disabled_source);
|
||||
|
||||
$table->data['source_data_dont_show_subgroups'][0] = __('Don\'t show subgroups:');
|
||||
$table->data['source_data_dont_show_subgroups'][1] =
|
||||
html_print_checkbox ('dont_show_subgroups', '1', $dont_show_subgroups, true);
|
||||
html_print_checkbox ('dont_show_subgroups', '1', $dont_show_subgroups, true, $disabled_source);
|
||||
|
||||
$table->data['source_data_empty'][0] = __('Start empty networkmap');
|
||||
if (((bool)$id)) {
|
||||
$table->data['source_data_empty'][1] =
|
||||
__('The networkmap has been generated already.');
|
||||
}
|
||||
else {
|
||||
$table->data['source_data_empty'][1] =
|
||||
html_print_checkbox_extended(
|
||||
'generation_process',
|
||||
'empty',
|
||||
false,
|
||||
false,
|
||||
'', '', true);
|
||||
}
|
||||
|
||||
|
||||
$table->data[3][0] = __('Size of networkmap (Width x Height)');
|
||||
$table->data[3][1] = html_print_input_text ('width', $width, '', 4,
|
||||
10,true) . __("x");
|
||||
$table->data[3][1] .= html_print_input_text ('height', $height, '',
|
||||
4, 10,true);
|
||||
$methods = array(
|
||||
'twopi' => 'radial',
|
||||
'dot' => 'flat',
|
||||
|
|
@ -358,17 +223,6 @@ else {
|
|||
$table->data[4][1] = html_print_select($methods, 'method', $method,
|
||||
'', '', 'twopi', true, false, true, '',
|
||||
$disabled_generation_method_select);
|
||||
$table->data[5][0] = __('Refresh network map state');
|
||||
$table->data[5][1] = html_print_extended_select_for_time(
|
||||
'refresh_state', $refresh_value, '', '', 0, 7, true);
|
||||
|
||||
$table->data[6][0] = __('Resize the networkmap');
|
||||
$table->data[6][0] .= ui_print_help_tip(
|
||||
__('This operation can\'t be undone, because it is on DB.'), true);
|
||||
$table->data[6][1] = '<div id="spinner_process"></div><div id="process_button">' .
|
||||
html_print_button(__('Process'),
|
||||
'process', !((bool)$id), 'resize_networkmap(' . $id . ');', 'class="sub"', true) .
|
||||
'</div>';
|
||||
|
||||
echo '<form method="post" action="index.php?sec=network&sec2=operation/agentes/pandora_networkmap">';
|
||||
|
||||
|
|
@ -391,55 +245,12 @@ else {
|
|||
}
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
function resize_networkmap(id) {
|
||||
var params1 = [];
|
||||
params1.push("get_image_path=1");
|
||||
params1.push("img_src=" + "images/spinner.gif");
|
||||
params1.push("page=include/ajax/skins.ajax");
|
||||
jQuery.ajax ({
|
||||
data: params1.join ("&"),
|
||||
type: 'POST',
|
||||
url: action="ajax.php",
|
||||
async: false,
|
||||
timeout: 10000,
|
||||
success: function (data) {
|
||||
$("#spinner_process").html(data);
|
||||
$("#process_button").hide();
|
||||
}
|
||||
});
|
||||
$("#submit-crt").hide();
|
||||
|
||||
|
||||
var params = [];
|
||||
params.push("resize_networkmap=1");
|
||||
params.push("id=" + id);
|
||||
params.push("page=operation/agentes/pandora_networkmap.editor");
|
||||
jQuery.ajax ({
|
||||
data: params.join ("&"),
|
||||
dataType: 'json',
|
||||
type: 'POST',
|
||||
url: action="ajax.php",
|
||||
success: function (data) {
|
||||
if (data['correct']) {
|
||||
//$("#spinner_process").hide();
|
||||
$("#spinner_process").html('<?php echo __('Networkmap resized.');?>');
|
||||
|
||||
|
||||
$("#text-width").val(data['width']);
|
||||
$("#text-height").val(data['height']);
|
||||
}
|
||||
else {
|
||||
$("#spinner_process").html('<?php echo __('Error process map');?>');
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
$("input[name='source_data']").on('change', function() {
|
||||
var source_data = $("input[name='source_data']:checked").val();
|
||||
$("input[name='source']").on('change', function() {
|
||||
var source = $("input[name='source']:checked").val();
|
||||
|
||||
if (source_data == 'recon_task') {
|
||||
if (source == 'recon_task') {
|
||||
$("#form_editor-source_data_ip_mask")
|
||||
.css('display', 'none');
|
||||
$("#form_editor-source_data_dont_show_subgroups")
|
||||
|
|
@ -447,7 +258,7 @@ $(document).ready(function() {
|
|||
$("#form_editor-source_data_recon_task")
|
||||
.css('display', '');
|
||||
}
|
||||
else if (source_data == 'ip_mask') {
|
||||
else if (source == 'ip_mask') {
|
||||
$("#form_editor-source_data_ip_mask")
|
||||
.css('display', '');
|
||||
$("#form_editor-source_data_recon_task")
|
||||
|
|
@ -455,7 +266,7 @@ $(document).ready(function() {
|
|||
$("#form_editor-source_data_dont_show_subgroups")
|
||||
.css('display', 'none');
|
||||
}
|
||||
else if (source_data == 'group') {
|
||||
else if (source == 'group') {
|
||||
$("#form_editor-source_data_ip_mask")
|
||||
.css('display', 'none');
|
||||
$("#form_editor-source_data_recon_task")
|
||||
|
|
@ -465,6 +276,6 @@ $(document).ready(function() {
|
|||
}
|
||||
});
|
||||
|
||||
$("input[name='source_data']").trigger("change");
|
||||
$("input[name='source']").trigger("change");
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -69,31 +69,64 @@ if ($new_networkmap || $save_networkmap) {
|
|||
}
|
||||
|
||||
$name = (string) get_parameter('name', '');
|
||||
$generation_process = get_parameter('generation_process', 'group');
|
||||
$width = (int) get_parameter('width', 3000);
|
||||
$height = (int) get_parameter('height', 3000);
|
||||
$method = (string) get_parameter('method', 'twopi');
|
||||
$refresh_state = (int) get_parameter('refresh_state', 60);
|
||||
$l2_network_interfaces = (int) get_parameter(
|
||||
'l2_network_interfaces', 0);
|
||||
|
||||
// --------- DEPRECATED ----------------------------------------
|
||||
$old_mode = (int)get_parameter('old_mode', 0);
|
||||
if ($old_mode) {
|
||||
$l2_network_interfaces = 0;
|
||||
}
|
||||
// --------- END DEPRECATED ------------------------------------
|
||||
// Default size values
|
||||
$width = 4000;
|
||||
$height = 4000;
|
||||
|
||||
$method = (string) get_parameter('method', 'twopi');
|
||||
|
||||
$recon_task_id = (int) get_parameter(
|
||||
'recon_task_id', 0);
|
||||
$ip_mask = get_parameter(
|
||||
'ip_mask', '');
|
||||
$source_data = (string)get_parameter('source_data', 'group');
|
||||
$source = (string)get_parameter('source', 'group');
|
||||
$dont_show_subgroups = (int)get_parameter('dont_show_subgroups', 0);
|
||||
$node_radius = (int)get_parameter('node_radius', 40);
|
||||
$description = get_parameter('description', '');
|
||||
|
||||
$values = array();
|
||||
$values['name'] = $name;
|
||||
$values['id_group'] = $id_group;
|
||||
$values['source_period'] = 60;
|
||||
$values['width'] = $width;
|
||||
$values['height'] = $height;
|
||||
$values['id_user'] = $config['id_user'];
|
||||
$values['description'] = $description;
|
||||
|
||||
switch ($method) {
|
||||
case 'twopi':
|
||||
$values['generation_method'] = 2;
|
||||
break;
|
||||
case 'dot':
|
||||
$values['generation_method'] = 1;
|
||||
break;
|
||||
case 'circo':
|
||||
$values['generation_method'] = 0;
|
||||
break;
|
||||
case 'neato':
|
||||
$values['generation_method'] = 3;
|
||||
break;
|
||||
case 'fdp':
|
||||
$values['generation_method'] = 4;
|
||||
break;
|
||||
default:
|
||||
$values['generation_method'] = 2;
|
||||
break;
|
||||
}
|
||||
|
||||
if ($source == 'group') {
|
||||
$values['source'] = 0;
|
||||
$values['source_data'] = $id_group;
|
||||
}
|
||||
else if ($source == 'recon_task') {
|
||||
$values['source'] = 1;
|
||||
$values['source_data'] = $recon_task_id;
|
||||
}
|
||||
else if ($source == 'ip_mask') {
|
||||
$values['source'] = 2;
|
||||
$values['source_data'] = $ip_mask;
|
||||
}
|
||||
|
||||
if (!$networkmap_write && !$networkmap_manage) {
|
||||
db_pandora_audit("ACL Violation",
|
||||
|
|
@ -102,26 +135,14 @@ if ($new_networkmap || $save_networkmap) {
|
|||
return;
|
||||
}
|
||||
|
||||
$options = array();
|
||||
$options['refresh_state'] = 60;
|
||||
$options['width'] = $width;
|
||||
$options['height'] = $height;
|
||||
$options['method'] = $method;
|
||||
$options['generation_process'] = $generation_process;
|
||||
$options['refresh_state'] = $refresh_state;
|
||||
$options['l2_network_interfaces'] = $l2_network_interfaces;
|
||||
// --------- DEPRECATED ----------------------------------------
|
||||
$options['old_mode'] = $old_mode;
|
||||
// --------- END DEPRECATED ------------------------------------
|
||||
$options['recon_task_id'] = $recon_task_id;
|
||||
$options['ip_mask'] = $ip_mask;
|
||||
$options['dont_show_subgroups'] = $dont_show_subgroups;
|
||||
$options['source_data'] = $source_data;
|
||||
$values['options'] = json_encode($options);
|
||||
$filter = array();
|
||||
$filter['dont_show_subgroups'] = $dont_show_subgroups;
|
||||
$filter['node_radius'] = $node_radius;
|
||||
$values['filter'] = json_encode($filter);
|
||||
|
||||
$result = false;
|
||||
if (!empty($name)) {
|
||||
$result = db_process_sql_insert('tnetworkmap_enterprise',
|
||||
$result = db_process_sql_insert('tmap',
|
||||
$values);
|
||||
}
|
||||
|
||||
|
|
@ -154,7 +175,6 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
|
|||
}
|
||||
|
||||
// ACL for the network map
|
||||
// $networkmap_read = check_acl ($config['id_user'], $id_group_old, "MR");
|
||||
$networkmap_write = check_acl ($config['id_user'], $id_group_old, "MW");
|
||||
$networkmap_manage = check_acl ($config['id_user'], $id_group_old, "MM");
|
||||
|
||||
|
|
@ -169,7 +189,6 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
|
|||
$id_group = (int) get_parameter('id_group', 0);
|
||||
|
||||
// ACL for the new network map
|
||||
// $networkmap_read_new = check_acl ($config['id_user'], $id_group, "MR");
|
||||
$networkmap_write_new = check_acl ($config['id_user'], $id_group, "MW");
|
||||
$networkmap_manage_new = check_acl ($config['id_user'], $id_group, "MM");
|
||||
|
||||
|
|
@ -181,43 +200,43 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
|
|||
}
|
||||
|
||||
$name = (string) get_parameter('name', '');
|
||||
$width = (int) get_parameter('width', 3000);
|
||||
$height = (int) get_parameter('height', 3000);
|
||||
$method = (string) get_parameter('method', 'twopi');
|
||||
$refresh_state = (int) get_parameter('refresh_state', 60);
|
||||
$l2_network_interfaces = (int) get_parameter(
|
||||
'l2_network_interfaces', 0);
|
||||
// --------- DEPRECATED ----------------------------------------
|
||||
$old_mode = (int)get_parameter('old_mode', 0);
|
||||
if ($old_mode) {
|
||||
$l2_network_interfaces = 0;
|
||||
}
|
||||
// --------- END DEPRECATED ------------------------------------
|
||||
|
||||
$recon_task_id = (int) get_parameter(
|
||||
'recon_task_id', 0);
|
||||
$source_data = (string)get_parameter('source_data', 'group');
|
||||
|
||||
$source = (string)get_parameter('source', 'group');
|
||||
|
||||
$values = array();
|
||||
$values['name'] = $name;
|
||||
$values['id_group'] = $id_group;
|
||||
if ($source == 'group') {
|
||||
$values['source'] = 0;
|
||||
$values['source_data'] = $id_group;
|
||||
}
|
||||
else if ($source == 'recon_task') {
|
||||
$values['source'] = 1;
|
||||
$values['source_data'] = $recon_task_id;
|
||||
}
|
||||
else if ($source == 'ip_mask') {
|
||||
$values['source'] = 2;
|
||||
$values['source_data'] = $ip_mask;
|
||||
}
|
||||
$description = get_parameter('description', '');
|
||||
$values['description'] = $description;
|
||||
|
||||
$row = db_get_row('tnetworkmap_enterprise', 'id', $id);
|
||||
$options = json_decode($row['options'], true);
|
||||
$options['width'] = $width;
|
||||
$options['height'] = $height;
|
||||
$options['refresh_state'] = $refresh_state;
|
||||
$options['l2_network_interfaces'] = $l2_network_interfaces;
|
||||
// --------- DEPRECATED ----------------------------------------
|
||||
$options['old_mode'] = $old_mode;
|
||||
// --------- END DEPRECATED ------------------------------------
|
||||
$options['recon_task_id'] = $recon_task_id;
|
||||
$options['source_data'] = $source_data;
|
||||
|
||||
$values['options'] = json_encode($options);
|
||||
|
||||
$dont_show_subgroups = (int)get_parameter('dont_show_subgroups', 0);
|
||||
$node_radius = (int)get_parameter('node_radius', 40);
|
||||
$row = db_get_row('tmap', 'id', $id);
|
||||
$filter = json_decode($row['filter'], true);
|
||||
$filter['dont_show_subgroups'] = $dont_show_subgroups;
|
||||
$filter['node_radius'] = $node_radius;
|
||||
|
||||
$values['filter'] = json_encode($filter);
|
||||
html_debug($values);
|
||||
$result = false;
|
||||
if (!empty($name)) {
|
||||
$result = db_process_sql_update('tnetworkmap_enterprise',
|
||||
$result = db_process_sql_update('tmap',
|
||||
$values, array('id' => $id));
|
||||
}
|
||||
|
||||
|
|
@ -226,7 +245,6 @@ else if ($update_networkmap || $copy_networkmap || $delete) {
|
|||
true);
|
||||
|
||||
if ($result) {
|
||||
// $networkmap_read = $networkmap_read_new;
|
||||
$networkmap_write = $networkmap_write_new;
|
||||
$networkmap_manage = $networkmap_manage_new;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
<?php
|
||||
// ______ __ _______ _______ _______
|
||||
//| __ \.---.-.-----.--| |.-----.----.---.-. | ___| | | __|
|
||||
//| __/| _ | | _ || _ | _| _ | | ___| |__ |
|
||||
//|___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
|
||||
//
|
||||
// ============================================================================
|
||||
// Copyright (c) 2007-2010 Artica Soluciones Tecnologicas, http://www.artica.es
|
||||
// This code is NOT free software. This code is NOT licenced under GPL2 licence
|
||||
// You cannnot redistribute it without written permission of copyright holder.
|
||||
// ============================================================================
|
||||
|
||||
if (! isset($_SESSION["id_usuario"])) {
|
||||
session_start();
|
||||
}
|
||||
|
||||
// Global & session management
|
||||
require_once ('../../include/config.php');
|
||||
require_once ($config['homedir'] . '/include/auth/mysql.php');
|
||||
require_once ($config['homedir'] . '/include/functions.php');
|
||||
require_once ($config['homedir'] . '/include/functions_db.php');
|
||||
require_once ($config['homedir'] . '/include/functions_reporting.php');
|
||||
require_once ($config['homedir'] . '/include/functions_graph.php');
|
||||
require_once ($config['homedir'] . '/include/functions_modules.php');
|
||||
require_once ($config['homedir'] . '/include/functions_ui.php');
|
||||
require_once ($config['homedir'] . '/include/functions_pandora_networkmap.php');
|
||||
|
||||
check_login();
|
||||
//error_reporting(E_ALL);
|
||||
//ini_set("display_errors", 1);
|
||||
|
||||
$id_node = (int)get_parameter('id', 0);
|
||||
$row = db_get_row('titem', 'id', $id_node);
|
||||
$networkmap = db_get_row('tmap', 'id', $row['id_map']);
|
||||
$id_agent = (int)get_parameter('id_agent', 0);
|
||||
|
||||
// ACL for the network map
|
||||
$networkmap_read = check_acl ($config['id_user'], $networkmap['id_group'], "MR");
|
||||
$networkmap_write = check_acl ($config['id_user'], $networkmap['id_group'], "MW");
|
||||
$networkmap_manage = check_acl ($config['id_user'], $networkmap['id_group'], "MM");
|
||||
|
||||
if (!$networkmap_read && !$networkmap_write && !$networkmap_manage) {
|
||||
db_pandora_audit("ACL Violation",
|
||||
"Trying to access networkmap");
|
||||
require ("general/noaccess.php");
|
||||
return;
|
||||
}
|
||||
|
||||
$user_readonly = !$networkmap_write && !$networkmap_manage;
|
||||
|
||||
$refresh_state = (int)get_parameter('refresh_state', 0);
|
||||
|
||||
$style = json_decode($row['style'], true);
|
||||
|
||||
//The next line "<!DOCTYPE...." it is necesary for IE9 because
|
||||
//this browser doesn't execute correcly the getContext without this line.
|
||||
?>
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<title><?php echo __('Details of node:') . ' ' . $style['label'];?></title>
|
||||
<script type="text/javascript" src="../../include/javascript/jquery-1.6.1.min.js"></script>
|
||||
<script type="text/javascript" src="../../include/javascript/jquery.colorpicker.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<style type="text/css">
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
</style>
|
||||
<?php
|
||||
show_node_info($id_node, $refresh_state, $user_readonly, $id_agent);
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue