diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index cea127f9e7..ac3154b657 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -225,15 +225,9 @@ if (check_acl($config['id_user'], 0, 'AW') || check_acl($config['id_user'], 0, ' if (check_acl($config['id_user'], 0, 'PM')) { enterprise_hook('ha_cluster'); - $sub['godmode/servers/manage_recontask']['text'] = __('Recon task'); - $sub['godmode/servers/manage_recontask']['id'] = 'Recon task'; - $sub['godmode/servers/plugin']['text'] = __('Plugins'); $sub['godmode/servers/plugin']['id'] = 'Plugins'; - $sub['godmode/servers/recon_script']['text'] = __('Recon script'); - $sub['godmode/servers/recon_script']['id'] = 'Recon script'; - enterprise_hook('export_target_submenu'); enterprise_hook('manage_satellite_submenu'); diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index a76571d54a..ef00231ae7 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -1,51 +1,65 @@ ".html_print_image('images/operation.png', true, ['title' => __('View')]).''; -} + } -$user_groups_w = users_get_groups(false, 'PM', true, false, null, 'id_grupo'); -$user_groups_w = array_keys($user_groups_w); + $user_groups_w = users_get_groups(false, 'PM', true, false, null, 'id_grupo'); + $user_groups_w = array_keys($user_groups_w); -$user_groups_r = users_get_groups(false, 'AW', true, false, null, 'id_grupo'); -$user_groups_r = array_keys($user_groups_r); + $user_groups_r = users_get_groups(false, 'AW', true, false, null, 'id_grupo'); + $user_groups_r = array_keys($user_groups_r); -// Headers -// ui_print_page_header (__('Manage recontask'), "images/gm_servers.png", false, "", true); -ui_print_page_header(__('Manage recontask'), 'images/gm_servers.png', false, '', true, $options); + // Headers + // ui_print_page_header (__('Manage recontask'), "images/gm_servers.png", false, "", true); + ui_print_page_header(__('Manage recontask'), 'images/gm_servers.png', false, '', true, $options); -// -------------------------------- -// DELETE A RECON TASKs -// -------------------------------- -if (isset($_GET['delete'])) { + // -------------------------------- + // DELETE A RECON TASKs + // -------------------------------- + if (isset($_GET['delete'])) { $id = get_parameter_get('delete'); $result = db_process_sql_delete('trecon_task', ['id_rt' => $id]); @@ -55,7 +69,7 @@ if (isset($_GET['delete'])) { } else { ui_print_error_message(__('Error deleting recon task')); } -} else if (isset($_GET['disabled'])) { + } else if (isset($_GET['disabled'])) { $id = get_parameter_get('id'); $disabled = get_parameter_get('disabled'); @@ -70,12 +84,12 @@ if (isset($_GET['delete'])) { } else { ui_print_error_message(__('Error updating recon task')); } -} + } -// -------------------------------- -// GET PARAMETERS IF UPDATE OR CREATE -// -------------------------------- -if ((isset($_GET['update'])) or ((isset($_GET['create'])))) { + // -------------------------------- + // GET PARAMETERS IF UPDATE OR CREATE + // -------------------------------- + if ((isset($_GET['update'])) or ((isset($_GET['create'])))) { $name = get_parameter_post('name'); $network = get_parameter_post('network'); $description = get_parameter_post('description'); @@ -127,12 +141,12 @@ if ((isset($_GET['update'])) or ((isset($_GET['create'])))) { } $macros = io_json_mb_encode($macros); -} + } -// -------------------------------- -// UPDATE A RECON TASK -// -------------------------------- -if (isset($_GET['update'])) { + // -------------------------------- + // UPDATE A RECON TASK + // -------------------------------- + if (isset($_GET['update'])) { $id = get_parameter_get('update'); $values = [ @@ -210,12 +224,12 @@ if (isset($_GET['update'])) { include 'manage_recontask_form.php'; return; } -} + } -// -------------------------------- -// CREATE A RECON TASK -// -------------------------------- -if (isset($_GET['create'])) { + // -------------------------------- + // CREATE A RECON TASK + // -------------------------------- + if (isset($_GET['create'])) { $values = [ 'name' => $name, 'subnet' => $network, @@ -311,28 +325,28 @@ if (isset($_GET['create'])) { include 'manage_recontask_form.php'; return; } -} + } -// -------------------------------- -// SHOW TABLE WITH ALL RECON TASKs -// -------------------------------- -// Pandora Admin must see all columns -if (! check_acl($config['id_user'], 0, 'PM')) { + // -------------------------------- + // SHOW TABLE WITH ALL RECON TASKs + // -------------------------------- + // Pandora Admin must see all columns + if (! check_acl($config['id_user'], 0, 'PM')) { $sql = sprintf( 'SELECT * - FROM trecon_task RT, tusuario_perfil UP - WHERE - UP.id_usuario = "%s" AND UP.id_grupo = RT.id_group', + FROM trecon_task RT, tusuario_perfil UP + WHERE + UP.id_usuario = "%s" AND UP.id_grupo = RT.id_group', $config['id_user'] ); $result = db_get_all_rows_sql($sql); -} else { + } else { $result = db_get_all_rows_in_table('trecon_task'); -} + } -$color = 1; -if ($result !== false) { + $color = 1; + if ($result !== false) { $table = new StdClass(); $table->head = [ __('Name'), @@ -460,12 +474,13 @@ if ($result !== false) { html_print_table($table); unset($table); -} else { + } else { echo '
'.__('There are no recon task configured').'
'; -} + } -echo '
'; -echo '
'; -echo html_print_submit_button(__('Create'), 'crt', false, 'class="sub next"', true); -echo '
'; -echo '
'; + echo '
'; + echo '
'; + echo html_print_submit_button(__('Create'), 'crt', false, 'class="sub next"', true); + echo '
'; + echo '
'; +*/ diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index cbbcde8ec7..669de92d3a 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -1,36 +1,51 @@ '; echo __('Warning').': '.__('By default, in Windows, %s only support Standard network sweep, not custom scripts', get_product_name()); echo ''; -} + } -$table = new stdClass(); -$table->id = 'table_recon'; -$table->width = '100%'; -$table->cellspacing = 4; -$table->cellpadding = 4; -$table->class = 'databox filters'; + $table = new stdClass(); + $table->id = 'table_recon'; + $table->width = '100%'; + $table->cellspacing = 4; + $table->cellpadding = 4; + $table->class = 'databox filters'; -$table->rowclass[3] = 'network_sweep'; -$table->rowclass[5] = 'network_sweep'; -$table->rowclass[7] = 'network_sweep'; -$table->rowclass[8] = 'network_sweep'; -$table->rowclass[11] = 'network_sweep'; -$table->rowclass[12] = 'network_sweep'; -$table->rowclass[18] = 'network_sweep'; -$table->rowclass[19] = 'network_sweep'; -$table->rowclass[20] = 'network_sweep'; -$table->rowclass[21] = 'network_sweep'; -$table->rowclass[22] = 'network_sweep'; -$table->rowclass[23] = 'network_sweep'; -$table->rowclass[24] = 'network_sweep'; -$table->rowclass[25] = 'network_sweep recon_v3'; -$table->rowclass[26] = 'network_sweep recon_v3'; -$table->rowclass[27] = 'network_sweep recon_v3'; -$table->rowclass[28] = 'network_sweep recon_v3'; -$table->rowclass[29] = 'network_sweep recon_v3'; -$table->rowclass[30] = 'network_sweep recon_v3'; + $table->rowclass[3] = 'network_sweep'; + $table->rowclass[5] = 'network_sweep'; + $table->rowclass[7] = 'network_sweep'; + $table->rowclass[8] = 'network_sweep'; + $table->rowclass[11] = 'network_sweep'; + $table->rowclass[12] = 'network_sweep'; + $table->rowclass[18] = 'network_sweep'; + $table->rowclass[19] = 'network_sweep'; + $table->rowclass[20] = 'network_sweep'; + $table->rowclass[21] = 'network_sweep'; + $table->rowclass[22] = 'network_sweep'; + $table->rowclass[23] = 'network_sweep'; + $table->rowclass[24] = 'network_sweep'; + $table->rowclass[25] = 'network_sweep recon_v3'; + $table->rowclass[26] = 'network_sweep recon_v3'; + $table->rowclass[27] = 'network_sweep recon_v3'; + $table->rowclass[28] = 'network_sweep recon_v3'; + $table->rowclass[29] = 'network_sweep recon_v3'; + $table->rowclass[30] = 'network_sweep recon_v3'; -$table->rowclass[6] = 'recon_script'; -$table->rowclass[13] = 'recon_script'; -$table->rowclass[14] = 'recon_script'; -$table->rowclass[15] = 'recon_script'; -$table->rowclass[16] = 'recon_script'; -$table->rowclass[17] = 'recon_script'; -// Name -$table->data[0][0] = ''.__('Task name').''; -$table->data[0][1] = html_print_input_text('name', $name, '', 25, 0, true); + $table->rowclass[6] = 'recon_script'; + $table->rowclass[13] = 'recon_script'; + $table->rowclass[14] = 'recon_script'; + $table->rowclass[15] = 'recon_script'; + $table->rowclass[16] = 'recon_script'; + $table->rowclass[17] = 'recon_script'; + // Name + $table->data[0][0] = ''.__('Task name').''; + $table->data[0][1] = html_print_input_text('name', $name, '', 25, 0, true); -// Discovery server -$table->data[1][0] = ''.__('Discovery server').ui_print_help_tip( + // Discovery server + $table->data[1][0] = ''.__('Discovery server').ui_print_help_tip( __('You must select a Discovery Server to run the Task, otherwise the Recon Task will never run'), true -); + ); -$sql = 'SELECT id_server, name - FROM tserver - WHERE server_type = 3 - ORDER BY name'; -$table->data[1][1] = html_print_select_from_sql($sql, 'id_recon_server', $id_recon_server, '', '', '', true); + $sql = 'SELECT id_server, name + FROM tserver + WHERE server_type = 3 + ORDER BY name'; + $table->data[1][1] = html_print_select_from_sql($sql, 'id_recon_server', $id_recon_server, '', '', '', true); -$fields['network_sweep'] = __('Network sweep'); -if (!$is_windows) { + $fields['network_sweep'] = __('Network sweep'); + if (!$is_windows) { $fields['recon_script'] = __('Custom script'); -} + } -$table->data[2][0] = ''.__('Mode').''; -$table->data[2][1] = html_print_select($fields, 'mode', $mode, '', '', 0, true); + $table->data[2][0] = ''.__('Mode').''; + $table->data[2][1] = html_print_select($fields, 'mode', $mode, '', '', 0, true); -// Network -$table->data[3][0] = ''.__('Network').''; -$table->data[3][0] .= ui_print_help_tip(__('You can specify several networks, separated by commas, for example: 192.168.50.0/24,192.168.60.0/24'), true); -$table->data[3][1] = html_print_input_text('network', $network, '', 25, 0, true); + // Network + $table->data[3][0] = ''.__('Network').''; + $table->data[3][0] .= ui_print_help_tip(__('You can specify several networks, separated by commas, for example: 192.168.50.0/24,192.168.60.0/24'), true); + $table->data[3][1] = html_print_input_text('network', $network, '', 25, 0, true); -// Interval -$interv_manual = 0; -if ((int) $interval == 0) { + // Interval + $interv_manual = 0; + if ((int) $interval == 0) { $interv_manual = 1; -} + } -$table->data[4][0] = ''.__('Interval'); -$table->data[4][0] .= ui_print_help_tip(__('Manual interval means that it will be executed only On-demand'), true); + $table->data[4][0] = ''.__('Interval'); + $table->data[4][0] .= ui_print_help_tip(__('Manual interval means that it will be executed only On-demand'), true); -$values = [ + $values = [ 0 => __('Defined'), 1 => __('Manual'), -]; -$table->data[4][1] = html_print_select($values, 'interval_manual_defined', $interv_manual, '', '', '', true); + ]; + $table->data[4][1] = html_print_select($values, 'interval_manual_defined', $interv_manual, '', '', '', true); -$table->data[4][1] .= ''; -$table->data[4][1] .= html_print_extended_select_for_time('interval', $interval, '', '', '0', false, true, false, false); -$table->data[4][1] .= ui_print_help_tip(__('The minimum recomended interval for Recon Task is 5 minutes'), true); -$table->data[4][1] .= ''; + $table->data[4][1] .= ''; + $table->data[4][1] .= html_print_extended_select_for_time('interval', $interval, '', '', '0', false, true, false, false); + $table->data[4][1] .= ui_print_help_tip(__('The minimum recomended interval for Recon Task is 5 minutes'), true); + $table->data[4][1] .= ''; -// Module template -$table->data[5][0] = ''.__('Module template').''; + // Module template + $table->data[5][0] = ''.__('Module template').''; -$sql = 'SELECT id_np, name - FROM tnetwork_profile - ORDER BY name'; -$table->data[5][1] = html_print_select_from_sql($sql, 'id_network_profile', $id_network_profile, '', __('None'), 0, true); + $sql = 'SELECT id_np, name + FROM tnetwork_profile + ORDER BY name'; + $table->data[5][1] = html_print_select_from_sql($sql, 'id_network_profile', $id_network_profile, '', __('None'), 0, true); -// Recon script -$data[1] = ''; -$table->data[6][0] = ''.__('Recon script').''; + // Recon script + $data[1] = ''; + $table->data[6][0] = ''.__('Recon script').''; -$sql = "SELECT id_recon_script, name - FROM trecon_script - WHERE name <> 'IPAM Recon' - ORDER BY name"; -if ($name_script != 'IPAM Recon') { + $sql = "SELECT id_recon_script, name + FROM trecon_script + WHERE name <> 'IPAM Recon' + ORDER BY name"; + if ($name_script != 'IPAM Recon') { $table->data[6][1] = html_print_select_from_sql($sql, 'id_recon_script', $id_recon_script, '', '', '', true); $table->data[6][1] .= "'; $table->data[6][1] .= $data[1] .= html_print_input_hidden('macros', base64_encode($macros), true); -} else { + } else { $table->data[6][1] = 'IPAM Recon'; -} + } -// OS -$table->data[7][0] = ''.__('OS').''; + // OS + $table->data[7][0] = ''.__('OS').''; -$sql = 'SELECT id_os, name - FROM tconfig_os - ORDER BY name'; -$table->data[7][1] = html_print_select_from_sql($sql, 'id_os', $id_os, '', __('Any'), -1, true); + $sql = 'SELECT id_os, name + FROM tconfig_os + ORDER BY name'; + $table->data[7][1] = html_print_select_from_sql($sql, 'id_os', $id_os, '', __('Any'), -1, true); -// Recon ports -$table->data[8][0] = ''.__('Ports').''; -$table->data[8][1] = html_print_input_text('recon_ports', $recon_ports, '', 25, 0, true); -$table->data[8][1] .= ui_print_help_tip( + // Recon ports + $table->data[8][0] = ''.__('Ports').''; + $table->data[8][1] = html_print_input_text('recon_ports', $recon_ports, '', 25, 0, true); + $table->data[8][1] .= ui_print_help_tip( __('Ports defined like: 80 or 80,443,512 or even 0-1024 (Like Nmap command line format). If dont want to do a sweep using portscan, left it in blank'), true -); + ); -// Group -$table->data[9][0] = ''.__('Group'); -$groups = users_get_groups(false, 'PM', false); -$table->data[9][1] = html_print_select_groups(false, 'PM', false, 'id_group', $id_group, '', '', 0, true); + // Group + $table->data[9][0] = ''.__('Group'); + $groups = users_get_groups(false, 'PM', false); + $table->data[9][1] = html_print_select_groups(false, 'PM', false, 'id_group', $id_group, '', '', 0, true); -// Incident -$values = [ + // Incident + $values = [ 0 => __('No'), 1 => __('Yes'), -]; -$table->data[10][0] = ''.__('Incident'); -$table->data[10][1] = html_print_select( + ]; + $table->data[10][0] = ''.__('Incident'); + $table->data[10][1] = html_print_select( $values, 'create_incident', $create_incident, @@ -356,27 +371,27 @@ $table->data[10][1] = html_print_select( '', '', true -).' '.ui_print_help_tip(__('Choose if the discovery of a new system creates an incident or not.'), true); + ).' '.ui_print_help_tip(__('Choose if the discovery of a new system creates an incident or not.'), true); -// snmp_enabled -$table->data[11][0] = ''.__('SNMP enabled'); -$table->data[11][1] = html_print_checkbox('snmp_enabled', 1, $snmp_enabled, true); + // snmp_enabled + $table->data[11][0] = ''.__('SNMP enabled'); + $table->data[11][1] = html_print_checkbox('snmp_enabled', 1, $snmp_enabled, true); -// SNMP default community -$table->data[12][0] = ''.__('SNMP Default community'); -$table->data[12][0] .= ui_print_help_tip(__('You can specify several values, separated by commas, for example: public,mysecret,1234'), true); -$table->data[12][1] = html_print_input_text('snmp_community', $snmp_community, '', 35, 0, true); + // SNMP default community + $table->data[12][0] = ''.__('SNMP Default community'); + $table->data[12][0] .= ui_print_help_tip(__('You can specify several values, separated by commas, for example: public,mysecret,1234'), true); + $table->data[12][1] = html_print_input_text('snmp_community', $snmp_community, '', 35, 0, true); -// SNMP version -$snmp_versions['1'] = 'v. 1'; -$snmp_versions['2'] = 'v. 2'; -$snmp_versions['2c'] = 'v. 2c'; -$snmp_versions['3'] = 'v. 3'; -$table->data[24][0] = ''._('SNMP version'); -$table->data[24][1] = html_print_select($snmp_versions, 'snmp_version', $snmp_version, '', '', 0, true); + // SNMP version + $snmp_versions['1'] = 'v. 1'; + $snmp_versions['2'] = 'v. 2'; + $snmp_versions['2c'] = 'v. 2c'; + $snmp_versions['3'] = 'v. 3'; + $table->data[24][0] = ''._('SNMP version'); + $table->data[24][1] = html_print_select($snmp_versions, 'snmp_version', $snmp_version, '', '', 0, true); -$table->data[25][0] = ''.__('Auth user'); -$table->data[25][1] = html_print_input_text( + $table->data[25][0] = ''.__('Auth user'); + $table->data[25][1] = html_print_input_text( 'snmp_auth_user', $snmp3_auth_user, '', @@ -387,9 +402,9 @@ $table->data[25][1] = html_print_input_text( false, '', '' -); -$table->data[26][0] = ''.__('Auth password').ui_print_help_tip(__('The pass length must be eight character minimum.'), true); -$table->data[26][1] = html_print_input_password( + ); + $table->data[26][0] = ''.__('Auth password').ui_print_help_tip(__('The pass length must be eight character minimum.'), true); + $table->data[26][1] = html_print_input_password( 'snmp_auth_pass', $snmp3_auth_pass, '', @@ -399,13 +414,13 @@ $table->data[26][1] = html_print_input_password( '', false, '' -); -$table->data[26][1] .= html_print_input_hidden_extended('active_snmp_v3', 0, 'active_snmp_v3_mmen', true); + ); + $table->data[26][1] .= html_print_input_hidden_extended('active_snmp_v3', 0, 'active_snmp_v3_mmen', true); -$table->data[27][0] = ''.__('Privacy method'); -$table->data[27][1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp_privacy_method', $snmp3_privacy_method, '', '', '', true, false, false, '', ''); -$table->data[28][0] = ''.__('Privacy pass').ui_print_help_tip(__('The pass length must be eight character minimum.'), true); -$table->data[28][1] = html_print_input_password( + $table->data[27][0] = ''.__('Privacy method'); + $table->data[27][1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp_privacy_method', $snmp3_privacy_method, '', '', '', true, false, false, '', ''); + $table->data[28][0] = ''.__('Privacy pass').ui_print_help_tip(__('The pass length must be eight character minimum.'), true); + $table->data[28][1] = html_print_input_password( 'snmp_privacy_pass', $snmp3_privacy_pass, '', @@ -415,11 +430,11 @@ $table->data[28][1] = html_print_input_password( '', false, '' -); -$table->data[29][0] = ''.__('Auth method'); -$table->data[29][1] = html_print_select(['MD5' => __('MD5'), 'SHA' => __('SHA')], 'snmp_auth_method', $snmp3_auth_method, '', '', '', true, false, false, '', ''); -$table->data[30][0] = ''.__('Security level'); -$table->data[30][1] = html_print_select( + ); + $table->data[29][0] = ''.__('Auth method'); + $table->data[29][1] = html_print_select(['MD5' => __('MD5'), 'SHA' => __('SHA')], 'snmp_auth_method', $snmp3_auth_method, '', '', '', true, false, false, '', ''); + $table->data[30][0] = ''.__('Security level'); + $table->data[30][1] = html_print_select( [ 'noAuthNoPriv' => __('Not auth and not privacy method'), 'authNoPriv' => __('Auth and not privacy method'), @@ -435,25 +450,25 @@ $table->data[30][1] = html_print_select( false, '', '' -); + ); -// Explanation -$explanation = db_get_value('description', 'trecon_script', 'id_recon_script', $id_recon_script); + // Explanation + $explanation = db_get_value('description', 'trecon_script', 'id_recon_script', $id_recon_script); -$table->data[13][0] = ''.__('Explanation').''; -$table->data[13][1] = "'.html_print_textarea('explanation', 4, 60, $explanation, 'style="width: 388px;"', true); + $table->data[13][0] = ''.__('Explanation').''; + $table->data[13][1] = "'.html_print_textarea('explanation', 4, 60, $explanation, 'style="width: 388px;"', true); -// A hidden "model row" to clone it from javascript to add fields dynamicaly -$data = []; -$data[0] = 'macro_desc'; -$data[0] .= ui_print_help_tip('macro_help', true); -$data[1] = html_print_input_text('macro_name', 'macro_value', '', 100, 255, true); -$table->colspan['macro_field'][1] = 3; -$table->rowstyle['macro_field'] = 'display:none'; -$table->data['macro_field'] = $data; + // A hidden "model row" to clone it from javascript to add fields dynamicaly + $data = []; + $data[0] = 'macro_desc'; + $data[0] .= ui_print_help_tip('macro_help', true); + $data[1] = html_print_input_text('macro_name', 'macro_value', '', 100, 255, true); + $table->colspan['macro_field'][1] = 3; + $table->rowstyle['macro_field'] = 'display:none'; + $table->data['macro_field'] = $data; -// If there are $macros, we create the form fields -if (!empty($macros)) { + // If there are $macros, we create the form fields + if (!empty($macros)) { $macros = json_decode($macros, true); foreach ($macros as $k => $m) { @@ -474,84 +489,84 @@ if (!empty($macros)) { $table->data['macro'.$m['macro']] = $data; } -} + } -// Comments -$table->data[18][0] = ''.__('Comments'); -$table->data[18][1] = html_print_input_text('description', $description, '', 45, 0, true); + // Comments + $table->data[18][0] = ''.__('Comments'); + $table->data[18][1] = html_print_input_text('description', $description, '', 45, 0, true); -// OS detection -$table->data[19][0] = ''.__('OS detection'); -$table->data[19][1] = html_print_checkbox('os_detect', 1, $os_detect, true); + // OS detection + $table->data[19][0] = ''.__('OS detection'); + $table->data[19][1] = html_print_checkbox('os_detect', 1, $os_detect, true); -// Name resolution -$table->data[20][0] = ''.__('Name resolution'); -$table->data[20][1] = html_print_checkbox('resolve_names', 1, $resolve_names, true); + // Name resolution + $table->data[20][0] = ''.__('Name resolution'); + $table->data[20][1] = html_print_checkbox('resolve_names', 1, $resolve_names, true); -// Parent detection -$table->data[21][0] = ''.__('Parent detection'); -$table->data[21][1] = html_print_checkbox('parent_detection', 1, $parent_detection, true); + // Parent detection + $table->data[21][0] = ''.__('Parent detection'); + $table->data[21][1] = html_print_checkbox('parent_detection', 1, $parent_detection, true); -// Parent recursion -$table->data[22][0] = ''.__('Parent recursion'); -$table->data[22][1] = html_print_input_text('parent_recursion', $parent_recursion, '', 5, 0, true).ui_print_help_tip(__('Maximum number of parent hosts that will be created if parent detection is enabled.'), true); + // Parent recursion + $table->data[22][0] = ''.__('Parent recursion'); + $table->data[22][1] = html_print_input_text('parent_recursion', $parent_recursion, '', 5, 0, true).ui_print_help_tip(__('Maximum number of parent hosts that will be created if parent detection is enabled.'), true); -// vlan_enabled -$table->data[23][0] = ''.__('Vlan enabled'); -$table->data[23][1] = html_print_checkbox('vlan_enabled', 1, $vlan_enabled, true); + // vlan_enabled + $table->data[23][0] = ''.__('Vlan enabled'); + $table->data[23][1] = html_print_checkbox('vlan_enabled', 1, $vlan_enabled, true); -// Alias as name -// NOTE: The 7.0NG Recon Server will not generate random names, since IP -// address collisions could have other consequences. -// $table->data[22][0] = "".__('Alias as Name'); -// $table->data[22][1] = html_print_checkbox ('alias_as_name', 1, $alias_as_name, true); -// Different Form url if it's a create or if it's a update form -echo '
'; -html_print_table($table); -echo '
'; + // Alias as name + // NOTE: The 7.0NG Recon Server will not generate random names, since IP + // address collisions could have other consequences. + // $table->data[22][0] = "".__('Alias as Name'); + // $table->data[22][1] = html_print_checkbox ('alias_as_name', 1, $alias_as_name, true); + // Different Form url if it's a create or if it's a update form + echo ''; + html_print_table($table); + echo '
'; -if ($id_rt != -1) { + if ($id_rt != -1) { if ($name_script != 'IPAM Recon') { html_print_submit_button(__('Update'), 'crt', false, 'class="sub upd"'); } -} else { + } else { html_print_submit_button(__('Add'), 'crt', false, 'class="sub wand"'); -} + } -echo '
'; + echo '
'; -echo ''; + echo ''; -ui_require_javascript_file('pandora_modules'); + ui_require_javascript_file('pandora_modules'); -?> + ?> - + +*/ diff --git a/pandora_console/godmode/servers/recon_script.php b/pandora_console/godmode/servers/recon_script.php index b24c2a59e2..77b574d5e7 100644 --- a/pandora_console/godmode/servers/recon_script.php +++ b/pandora_console/godmode/servers/recon_script.php @@ -1,17 +1,33 @@ '; -} else { + } else { ui_print_page_header(__('Recon scripts registered on %s', get_product_name()), 'images/gm_servers.png', false, '', true); // Update reconscript @@ -264,12 +280,12 @@ if (($create != '') or ($view != '')) { $macros = io_json_mb_encode($macros); - $sql_update = "UPDATE trecon_script SET - name = '$reconscript_name', - description = '$reconscript_description', - script = '$reconscript_script', - macros = '$macros' - WHERE id_recon_script = $id_recon_script"; + $sql_update = "UPDATE trecon_script SET + name = '$reconscript_name', + description = '$reconscript_description', + script = '$reconscript_script', + macros = '$macros' + WHERE id_recon_script = $id_recon_script"; $result = false; if ($reconscript_name != '' && $reconscript_script != '') { $result = db_process_sql($sql_update); @@ -396,6 +412,7 @@ if (($create != '') or ($view != '')) { echo "
"; echo ""; echo ''; -} + } -ui_require_javascript_file('pandora_modules'); + ui_require_javascript_file('pandora_modules'); +*/