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

Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps

This commit is contained in:
fbsanchez 2020-03-27 11:42:09 +01:00
parent 3a74e25068 75de601f57
commit dffaafbf6a
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/godmode/menu.php
View File

@ -147,10 +147,10 @@ if (check_acl($config['id_user'], 0, 'PM')) {
$sub2 = []; $sub2 = [];
$sub2['godmode/modules/private_enterprise_numbers']['text'] = __('Private Enterprise Numbers'); $sub2['godmode/modules/private_enterprise_numbers']['text'] = __('Private Enterprise Numbers');
$sub2['godmode/modules/private_enterprise_numbers']['id'] = 'Private Enterprise Numbers'; $sub2['godmode/modules/private_enterprise_numbers']['id'] = 'Private Enterprise Numbers';
$sub2['godmode/modules/SNMP_modules']['text'] = __('SNMP Modules'); $sub2['godmode/modules/manage_snmp_modules']['text'] = __('SNMP Modules');
$sub2['godmode/modules/SNMP_modules']['id'] = 'SNMP Modules'; $sub2['godmode/modules/manage_snmp_modules']['id'] = 'SNMP Modules';
$sub2['godmode/modules/WMI_modules']['text'] = __('WMI Modules'); $sub2['godmode/modules/manage_wmi_modules']['text'] = __('WMI Modules');
$sub2['godmode/modules/WMI_modules']['id'] = 'WMI Modules'; $sub2['godmode/modules/manage_wmi_modules']['id'] = 'WMI Modules';
$sub['configuration_wizard_setup']['sub2'] = $sub2; $sub['configuration_wizard_setup']['sub2'] = $sub2;
$sub['godmode/modules/manage_block_templates']['text'] = __('Module blocks'); $sub['godmode/modules/manage_block_templates']['text'] = __('Module blocks');
$sub['godmode/modules/manage_block_templates']['id'] = 'Module blocks'; $sub['godmode/modules/manage_block_templates']['id'] = 'Module blocks';

16
pandora_console/include/class/HTML.class.php
View File

@ -746,6 +746,7 @@ class HTML
) { ) {
$form = $data['form']; $form = $data['form'];
$inputs = $data['inputs']; $inputs = $data['inputs'];
$rawInputs = $data['rawInputs'];
$js = $data['js']; $js = $data['js'];
$rawjs = $data['js_block']; $rawjs = $data['js_block'];
$cb_function = $data['cb_function']; $cb_function = $data['cb_function'];
@ -788,6 +789,11 @@ class HTML
$output .= '</ul>'; $output .= '</ul>';
// There is possible add raw inputs for this form.
if (empty($rawInputs) === false) {
$output .= $rawInputs;
}
if ($print_white_box === true) { if ($print_white_box === true) {
$output .= '</div>'; $output .= '</div>';
} }
@ -821,7 +827,7 @@ class HTML
$form = $data['form']; $form = $data['form'];
$rows = $data['rows']; $rows = $data['rows'];
$rawInputs = $data['rawInputs'];
$js = $data['js']; $js = $data['js'];
$rawjs = $data['js_block']; $rawjs = $data['js_block'];
$cb_function = $data['cb_function']; $cb_function = $data['cb_function'];
@ -896,6 +902,11 @@ class HTML
} }
} }
// There is possible add raw inputs for this form.
if (empty($rawInputs) === false) {
$output .= $rawInputs;
}
$output .= '</div>'; $output .= '</div>';
$output .= '<ul class="wizard">'.$output_submit.'</ul>'; $output .= '<ul class="wizard">'.$output_submit.'</ul>';
@ -962,12 +973,13 @@ class HTML
} }
$output .= '</ul>'; $output .= '</ul>';
$output .= '</div>';
// There is possible add raw inputs for this form. // There is possible add raw inputs for this form.
if (empty($rawInputs) === false) { if (empty($rawInputs) === false) {
$output .= $rawInputs; $output .= $rawInputs;
} }
$output .= '</div>';
$output .= '<ul class="wizard">'.$output_submit.'</ul>'; $output .= '<ul class="wizard">'.$output_submit.'</ul>';
$output .= '</form>'; $output .= '</form>';
$output .= '<script>'.$js.'</script>'; $output .= '<script>'.$js.'</script>';