Metasetup

This commit is contained in:
Pablo Aragon 2023-03-23 17:44:04 +01:00
parent 1ac37dd538
commit 122f45fcaa
6 changed files with 333 additions and 272 deletions

View File

@ -65,7 +65,7 @@ switch ($action) {
$table = new stdClass(); $table = new stdClass();
$table->class = 'info_table'; $table->class = 'info_table';
$table->width = '98%'; $table->width = '100%';
$table->head[0] = __('Map connection name'); $table->head[0] = __('Map connection name');
$table->head[1] = __('Group'); $table->head[1] = __('Group');
$table->head[3] = __('Delete'); $table->head[3] = __('Delete');
@ -84,7 +84,7 @@ if ($mapsConnections !== false) {
'<a href="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2&amp;action=edit_connection_map&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'">'.$mapsConnection['conection_name'].'</a>', '<a href="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2&amp;action=edit_connection_map&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'">'.$mapsConnection['conection_name'].'</a>',
ui_print_group_icon($mapsConnection['group_id'], true), ui_print_group_icon($mapsConnection['group_id'], true),
'<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection" '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>', onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter main_menu_icon']).'</a>',
]; ];
$table->cellclass[][2] = 'table_action_buttons'; $table->cellclass[][2] = 'table_action_buttons';
} }
@ -95,6 +95,14 @@ html_print_table($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">'; echo '<div class="action-buttons" style="width: '.$table->width.'">';
echo '<form action="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2" method="post">'; echo '<form action="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2" method="post">';
html_print_input_hidden('action', 'create_connection_map'); html_print_input_hidden('action', 'create_connection_map');
html_print_submit_button(__('Create'), '', false, 'class="sub next"'); html_print_action_buttons(
html_print_submit_button(
__('Create'),
'',
false,
['icon' => 'wand'],
true
)
);
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';

View File

@ -386,120 +386,132 @@ $table_alert_settings->data = [];
$table_alert_settings->width = '100%'; $table_alert_settings->width = '100%';
$table_alert_settings->styleTable = 'margin-bottom: 10px;'; $table_alert_settings->styleTable = 'margin-bottom: 10px;';
$table_alert_settings->id = 'integria-cr-settings-setup'; $table_alert_settings->id = 'integria-cr-settings-setup';
$table_alert_settings->class = 'databox filters'; $table_alert_settings->class = 'databox filters filter-table-adv';
$table_alert_settings->size['name'] = '30%'; $table_alert_settings->size[0] = '50%';
$table_alert_settings->style['name'] = 'font-weight: bold'; $table_alert_settings->size[1] = '50%';
// Alert incident title. // Alert incident title.
$row = []; $row = [];
$row['name'] = __('Title'); $row[0] = html_print_label_input_block(
$row['control'] = html_print_input_text( __('Title'),
'incident_title', html_print_input_text(
$config['incident_title'], 'incident_title',
__('Name'), $config['incident_title'],
50, __('Name'),
100, 50,
true, 100,
false, true,
false false,
false
)
); );
$table_alert_settings->data['custom_response_incident_title'] = $row;
// Alert incident description. // Alert incident description.
$row = []; $row[1] = html_print_label_input_block(
$row['name'] = __('Ticket body'); __('Ticket body'),
$row['control'] = html_print_textarea( html_print_textarea(
'incident_content', 'incident_content',
7, 3,
25, 25,
$config['incident_content'], $config['incident_content'],
'', '',
true true
)
); );
$table_alert_settings->data['custom_response_incident_content'] = $row; $table_alert_settings->data[0] = $row;
// Alert default group. // Alert default group.
$row = []; $row = [];
$row['name'] = __('Group'); $row[0] = html_print_label_input_block(
$row['control'] = html_print_select( __('Group'),
$integria_group_values, html_print_select(
'default_group', $integria_group_values,
$config['default_group'], 'default_group',
'', $config['default_group'],
__('Select'), '',
0, __('Select'),
true, 0,
false, true,
true, false,
'', true,
false '',
false
)
); );
$table_alert_settings->data['custom_response_def_group'] = $row;
// Alert default criticity. // Alert default criticity.
$row = []; $row[1] = html_print_label_input_block(
$row['name'] = __('Priority'); __('Priority'),
$row['control'] = html_print_select( html_print_select(
$integria_criticity_values, $integria_criticity_values,
'default_criticity', 'default_criticity',
$config['default_criticity'], $config['default_criticity'],
'', '',
__('Select'), __('Select'),
0, 0,
true, true,
false, false,
true, true,
'', '',
false false
)
); );
$table_alert_settings->data['custom_response_def_criticity'] = $row; $table_alert_settings->data[1] = $row;
// Alert default owner. // Alert default owner.
$row = []; $row = [];
$row['name'] = __('Owner'); $row[0] = html_print_label_input_block(
$row['control'] = html_print_autocomplete_users_from_integria( __('Owner'),
'default_owner', html_print_autocomplete_users_from_integria(
$config['default_owner'], 'default_owner',
true $config['default_owner'],
true,
'30',
false,
false,
'w100p'
),
['div_class' => 'inline']
); );
$table_alert_settings->data['custom_response_def_owner'] = $row;
// Alert default incident type. // Alert default incident type.
$row = []; $row[1] = html_print_label_input_block(
$row['name'] = __('Type'); __('Type'),
$row['control'] = html_print_select( html_print_select(
$integria_types_values, $integria_types_values,
'incident_type', 'incident_type',
$config['incident_type'], $config['incident_type'],
'', '',
__('Select'), __('Select'),
0, 0,
true, true,
false, false,
true, true,
'', '',
false false
)
); );
$table_alert_settings->data['custom_response_incident_type'] = $row; $table_alert_settings->data[2] = $row;
// Alert default incident status. // Alert default incident status.
$row = []; $row = [];
$row['name'] = __('Status'); $row[0] = html_print_label_input_block(
$row['control'] = html_print_select( __('Status'),
$integria_status_values, html_print_select(
'incident_status', $integria_status_values,
$config['incident_status'], 'incident_status',
'', $config['incident_status'],
__('Select'), '',
0, __('Select'),
true, 0,
false, true,
true, false,
'', true,
false '',
false
)
); );
$table_alert_settings->data['custom_response_incident_status'] = $row; $table_alert_settings->data[3] = $row;
// Custom response settings. // Custom response settings.
$table_cr_settings = new StdClass(); $table_cr_settings = new StdClass();
@ -507,121 +519,133 @@ $table_cr_settings->data = [];
$table_cr_settings->width = '100%'; $table_cr_settings->width = '100%';
$table_cr_settings->styleTable = 'margin-bottom: 10px;'; $table_cr_settings->styleTable = 'margin-bottom: 10px;';
$table_cr_settings->id = 'integria-cr-settings-setup'; $table_cr_settings->id = 'integria-cr-settings-setup';
$table_cr_settings->class = 'databox filters'; $table_cr_settings->class = 'databox filters filter-table-adv';
$table_cr_settings->size['name'] = '30%'; $table_cr_settings->size[0] = '50%';
$table_cr_settings->style['name'] = 'font-weight: bold'; $table_cr_settings->size[1] = '50%';
// Custom response incident title. // Custom response incident title.
$row = []; $row = [];
$row['name'] = __('Title'); $row[0] = html_print_label_input_block(
$row['control'] = html_print_input_text( __('Title'),
'cr_incident_title', html_print_input_text(
$config['cr_incident_title'], 'cr_incident_title',
__('Name'), $config['cr_incident_title'],
50, __('Name'),
100, 50,
true, 100,
false, true,
false false,
false
)
); );
$table_cr_settings->data['custom_response_incident_title'] = $row;
// Custom response incident description. // Custom response incident description.
$row = []; $row[1] = html_print_label_input_block(
$row['name'] = __('Ticket body'); __('Ticket body'),
$row['control'] = html_print_textarea( html_print_textarea(
'cr_incident_content', 'cr_incident_content',
7, 3,
25, 25,
$config['cr_incident_content'], $config['cr_incident_content'],
'', '',
true true
)
); );
$table_cr_settings->data['custom_response_incident_content'] = $row; $table_cr_settings->data[0] = $row;
// Custom response default group. // Custom response default group.
$row = []; $row = [];
$row['name'] = __('Group'); $row[0] = html_print_label_input_block(
$row['control'] = html_print_select( __('Group'),
$integria_group_values, html_print_select(
'cr_default_group', $integria_group_values,
$config['cr_default_group'], 'cr_default_group',
'', $config['cr_default_group'],
__('Select'), '',
0, __('Select'),
true, 0,
false, true,
true, false,
'', true,
false '',
false
)
); );
$table_cr_settings->data['custom_response_def_group'] = $row;
// Custom response default criticity. // Custom response default criticity.
$row = []; $row[1] = html_print_label_input_block(
$row['name'] = __('Priority'); __('Priority'),
$row['control'] = html_print_select( html_print_select(
$integria_criticity_values, $integria_criticity_values,
'cr_default_criticity', 'cr_default_criticity',
$config['cr_default_criticity'], $config['cr_default_criticity'],
'', '',
__('Select'), __('Select'),
0, 0,
true, true,
false, false,
true, true,
'', '',
false false
)
); );
$table_cr_settings->data['custom_response_def_criticity'] = $row; $table_cr_settings->data[1] = $row;
// Custom response default owner. // Custom response default owner.
$row = []; $row = [];
$row['name'] = __('Owner'); $row[0] = html_print_label_input_block(
$row['control'] = html_print_autocomplete_users_from_integria( __('Owner'),
'cr_default_owner', html_print_autocomplete_users_from_integria(
$config['cr_default_owner'], 'cr_default_owner',
true $config['cr_default_owner'],
true,
'30',
false,
false,
'w100p'
),
['div_class' => 'inline']
); );
$table_cr_settings->data['custom_response_def_owner'] = $row;
// Custom response default incident type. // Custom response default incident type.
$row = []; $row[1] = html_print_label_input_block(
$row['name'] = __('Type'); __('Type'),
$row['control'] = html_print_select( html_print_select(
$integria_types_values, $integria_types_values,
'cr_incident_type', 'cr_incident_type',
$config['cr_incident_type'], $config['cr_incident_type'],
'', '',
__('Select'), __('Select'),
0, 0,
true, true,
false, false,
true, true,
'', '',
false false
)
); );
$table_cr_settings->data['custom_response_incident_type'] = $row; $table_cr_settings->data[2] = $row;
// Custom response default incident status. // Custom response default incident status.
$row = []; $row = [];
$row['name'] = __('Status'); $row[0] = html_print_label_input_block(
$row['control'] = html_print_select( __('Status'),
$integria_status_values, html_print_select(
'cr_incident_status', $integria_status_values,
$config['cr_incident_status'], 'cr_incident_status',
'', $config['cr_incident_status'],
__('Select'), '',
0, __('Select'),
true, 0,
false, true,
true, false,
'', true,
false '',
false
)
); );
$table_cr_settings->data['custom_response_incident_status'] = $row; $table_cr_settings->data[3] = $row;
// Test. // Test.
$row = []; $row = [];
@ -682,7 +706,7 @@ echo '</div>';
if ($has_connection != false) { if ($has_connection != false) {
// Form alert default settings. // Form alert default settings.
echo '<div id="form_alert_settings">'; echo '<div id="form_alert_settings">';
echo '<fieldset>'; echo '<fieldset class="mrgn_top_15px">';
echo '<legend>'.__('Alert default values').'&nbsp'.ui_print_help_icon('alert_macros', true).'</legend>'; echo '<legend>'.__('Alert default values').'&nbsp'.ui_print_help_icon('alert_macros', true).'</legend>';
html_print_table($table_alert_settings); html_print_table($table_alert_settings);
@ -692,7 +716,7 @@ if ($has_connection != false) {
// Form custom response default settings. // Form custom response default settings.
echo '<div id="form_custom_response_settings">'; echo '<div id="form_custom_response_settings">';
echo '<fieldset>'; echo '<fieldset class="mrgn_top_15px">';
echo '<legend>'.__('Event custom response default values').'&nbsp'.ui_print_help_icon('alert_macros', true).'</legend>'; echo '<legend>'.__('Event custom response default values').'&nbsp'.ui_print_help_icon('alert_macros', true).'</legend>';
html_print_table($table_cr_settings); html_print_table($table_cr_settings);

View File

@ -50,7 +50,7 @@ try {
[ [
'id' => $tableId, 'id' => $tableId,
'class' => 'info_table', 'class' => 'info_table',
'style' => 'width: 100%', 'style' => 'width: 99%',
'columns' => $columns, 'columns' => $columns,
'column_names' => $column_names, 'column_names' => $column_names,
'ajax_url' => 'include/ajax/update_manager', 'ajax_url' => 'include/ajax/update_manager',
@ -66,12 +66,13 @@ try {
[ [
'label' => __('Free search'), 'label' => __('Free search'),
'type' => 'text', 'type' => 'text',
'class' => 'mw250px', 'class' => 'w400px',
'id' => 'free_search', 'id' => 'free_search',
'name' => 'free_search', 'name' => 'free_search',
], ],
], ],
], ],
'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar ',
] ]
); );
} catch (Exception $e) { } catch (Exception $e) {

View File

@ -256,133 +256,158 @@ if ((bool) is_metaconsole() === true) {
); );
} }
echo '<form method="post" action="'.$action.'">'; echo '<form method="post" action="'.$action.'" class="max_floating_element_size">';
html_print_input_hidden('update_config', 1); html_print_input_hidden('update_config', 1);
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters'; $table->class = 'databox filters filter-table-adv';
$table->size[0] = '50%';
$i = 0; $table->size[1] = '50%';
$table->style[$i] = 'font-weight: bolder;width:250px';
$url_update_manager = update_manager_get_url(); $url_update_manager = update_manager_get_url();
$table->data[$i][0] = __('Warp Update URL'); $table->data[0][0] = html_print_label_input_block(
$table->data[$i++][1] = html_print_input_text( __('Warp Update URL'),
'url_update_manager', html_print_input_text(
$url_update_manager, 'url_update_manager',
__('URL update manager'), $url_update_manager,
80, __('URL update manager'),
255, 80,
true, 255,
true true,
true
)
); );
$table->data[$i][0] = __('Use secured Warp Update'); $table->data[0][1] = html_print_label_input_block(
$table->data[$i++][1] = html_print_input( __('Use secured Warp Update'),
[ html_print_input(
'type' => 'switch', [
'name' => 'secure_update_manager', 'type' => 'switch',
'value' => ($secure_update_manager ?? 1), 'name' => 'secure_update_manager',
] 'value' => ($secure_update_manager ?? 1),
]
)
); );
$table->data[$i][0] = __('Proxy server'); $table->data[1][0] = html_print_label_input_block(
$table->data[$i++][1] = html_print_input_text(
'update_manager_proxy_server',
$update_manager_proxy_server,
__('Proxy server'), __('Proxy server'),
80, html_print_input_text(
60, 'update_manager_proxy_server',
true $update_manager_proxy_server,
__('Proxy server'),
80,
60,
true
)
); );
$table->data[$i][0] = __('Proxy port'); $table->data[1][1] = html_print_label_input_block(
$table->data[$i++][1] = html_print_input_text(
'update_manager_proxy_port',
$update_manager_proxy_port,
__('Proxy port'), __('Proxy port'),
80, html_print_input_text(
60, 'update_manager_proxy_port',
true $update_manager_proxy_port,
__('Proxy port'),
80,
60,
true
)
); );
$table->data[$i][0] = __('Proxy user'); $table->data[2][0] = html_print_label_input_block(
$table->data[$i++][1] = html_print_input_text(
'update_manager_proxy_user',
$update_manager_proxy_user,
__('Proxy user'), __('Proxy user'),
80, html_print_input_text(
60, 'update_manager_proxy_user',
true $update_manager_proxy_user,
__('Proxy user'),
80,
60,
true
)
); );
$table->data[$i][0] = __('Proxy password'); $table->data[2][1] = html_print_label_input_block(
$table->data[$i++][1] = html_print_input_password(
'update_manager_proxy_password',
$update_manager_proxy_password,
__('Proxy password'), __('Proxy password'),
80, html_print_input_password(
60, 'update_manager_proxy_password',
true $update_manager_proxy_password,
__('Proxy password'),
80,
60,
true
)
); );
$table->data[$i][0] = __('Allow no-consecutive patches'); $table->data[3][0] = html_print_label_input_block(
$table->data[$i++][1] = html_print_switch( __('Allow no-consecutive patches'),
[ html_print_switch(
'name' => 'allow_offline_patches', [
'value' => $allow_offline_patches, 'name' => 'allow_offline_patches',
'return' => true, 'value' => $allow_offline_patches,
] 'return' => true,
]
)
); );
$table->data[$i][0] = __('Limit to LTS updates'); $table->data[3][1] = html_print_label_input_block(
$table->data[$i++][1] = html_print_switch( __('Limit to LTS updates'),
[ html_print_switch(
'name' => 'lts_updates', [
'value' => $lts_updates, 'name' => 'lts_updates',
'return' => true, 'value' => $lts_updates,
] 'return' => true,
]
)
); );
$table->data[4][0] = html_print_label_input_block(
$table->data[$i][0] = __('Registration ID'); __('Registration ID'),
$table->data[$i++][1] = '<i>'.($config['pandora_uid'] ?? __('Not registred yet')).'</i>'; '<i>'.($config['pandora_uid'] ?? __('Not registred yet')).'</i>'
);
if (update_manager_verify_registration() === true && users_is_admin()) { if (update_manager_verify_registration() === true && users_is_admin()) {
$table->data[$i][0] = __('Cancel registration'); $url = '<a href="';
$table->data[$i][1] = '<a href="';
if ((bool) is_metaconsole() === true) { if ((bool) is_metaconsole() === true) {
$table->data[$i][1] .= ui_get_full_url( $url .= ui_get_full_url(
'index.php?sec=advanced&sec2=advanced/metasetup&pure=0&tab=update_manager_setup&um_disconnect_console=1' 'index.php?sec=advanced&sec2=advanced/metasetup&pure=0&tab=update_manager_setup&um_disconnect_console=1'
); );
} else { } else {
$table->data[$i][1] .= ui_get_full_url( $url .= ui_get_full_url(
'index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=setup&um_disconnect_console=1' 'index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=setup&um_disconnect_console=1'
); );
} }
$table->data[$i++][1] .= '" onclick="if(confirm(\'Are you sure?\')) {return true;} else { return false; }">'.__('Unregister').'</a>'; $url .= '" onclick="if(confirm(\'Are you sure?\')) {return true;} else { return false; }">'.__('Unregister').'</a>';
$table->data[4][1] = html_print_label_input_block(
__('Cancel registration'),
$url
);
} }
if (license_free()) { if (license_free()) {
$config['identification_reminder'] = isset($config['identification_reminder']) ? $config['identification_reminder'] : 1; $config['identification_reminder'] = isset($config['identification_reminder']) ? $config['identification_reminder'] : 1;
$table->data[$i][0] = __('%s community reminder', get_product_name()).ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this %s instance', get_product_name()), true);
$table->data[$i][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 1, '', $config['identification_reminder'], true).'&nbsp;&nbsp;'; $table->data[4][1] = html_print_label_input_block(
$table->data[$i++][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button('identification_reminder', 0, '', $config['identification_reminder'], true); __('%s community reminder', get_product_name()).ui_print_help_tip(__('Every 8 days, a message is displayed to admin users to remember to register this %s instance', get_product_name()), true),
'<div class="inline-radio-button">
'.__('Yes').html_print_radio_button('realtimestats', 1, '', $config['realtimestats'], true).'&nbsp;&nbsp;
'.__('No').html_print_radio_button('realtimestats', 0, '', $config['realtimestats'], true).'</div>'
);
} }
html_print_input_hidden('action_update_url_update_manager', 1); html_print_input_hidden('action_update_url_update_manager', 1);
html_print_input_hidden('update_config', 1); html_print_input_hidden('update_config', 1);
html_print_table($table); html_print_table($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">'; html_print_action_buttons(
html_print_submit_button( html_print_submit_button(
__('Update'), __('Update'),
'update_button', 'update_button',
false, false,
'class="sub upd"' ['icon' => 'wand'],
true
)
); );
echo '</div>';
echo '</form>'; echo '</form>';

View File

@ -626,7 +626,7 @@ function filemanager_file_explorer(
$table->width = '100%'; $table->width = '100%';
$table->id = 'table_filemanager'; $table->id = 'table_filemanager';
$table->class = (is_metaconsole() === true) ? 'databox_tactical' : 'info_table'; $table->class = 'info_table';
$table->title = '<span>'.__('Index of %s', $relative_directory).'</span>'; $table->title = '<span>'.__('Index of %s', $relative_directory).'</span>';
$table->colspan = []; $table->colspan = [];
$table->data = []; $table->data = [];
@ -751,7 +751,7 @@ function filemanager_file_explorer(
&& ($readOnly === false) && ($readOnly === false)
) { ) {
$data[4] .= '<form method="post" action="'.$url.'" style="">'; $data[4] .= '<form method="post" action="'.$url.'" style="">';
$data[4] .= '<input type="image" style="margin-top: 2px;height:21px" class="invert_filter" src="images/delete.svg" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'; $data[4] .= '<input type="image" style="margin-top: 2px;height:21px" class="invert_filter main_menu_icon" src="../../images/delete.svg" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[4] .= html_print_input_hidden('filename', $fileinfo['realpath'], true); $data[4] .= html_print_input_hidden('filename', $fileinfo['realpath'], true);
$data[4] .= html_print_input_hidden('hash', md5($fileinfo['realpath'].$config['server_unique_identifier']), true); $data[4] .= html_print_input_hidden('hash', md5($fileinfo['realpath'].$config['server_unique_identifier']), true);
$data[4] .= html_print_input_hidden('delete_file', 1, true); $data[4] .= html_print_input_hidden('delete_file', 1, true);
@ -896,7 +896,7 @@ function filemanager_file_explorer(
$uploadFileElements .= html_print_input_hidden('upload_file', 1, true); $uploadFileElements .= html_print_input_hidden('upload_file', 1, true);
} }
$uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, [ 'class' => 'submitButton', 'style' => 'float:right', 'icon' => 'next'], true); $uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, [ 'class' => 'submitButton', 'style' => 'float:right; margin-top: 10px;', 'icon' => 'next'], true);
$uploadFileElements .= html_print_input_hidden('real_directory', $real_directory, true); $uploadFileElements .= html_print_input_hidden('real_directory', $real_directory, true);
$uploadFileElements .= html_print_input_hidden('directory', $relative_directory, true); $uploadFileElements .= html_print_input_hidden('directory', $relative_directory, true);
$uploadFileElements .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['server_unique_identifier']), true); $uploadFileElements .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['server_unique_identifier']), true);

View File

@ -4787,13 +4787,16 @@ function html_print_input_file($name, $return=false, $options=false)
if (isset($options['accept']) === true) { if (isset($options['accept']) === true) {
$output .= ' accept="'.$options['accept'].'"'; $output .= ' accept="'.$options['accept'].'"';
} }
$label = '';
if (isset($options['label']) === true) {
$label = $options['label'];
}
} }
// Close input. // Close input.
$output .= '/>'; $output .= '/>';
if (is_metaconsole() === false) { $output .= ($options['caption'] ?? __('Select a file'));
$output .= ($options['caption'] ?? __('Select a file'));
}
$output .= '</label>'; $output .= '</label>';
$output .= '<span class="inputFileSpan" id="span-'.$name.'">&nbsp;</span>'; $output .= '<span class="inputFileSpan" id="span-'.$name.'">&nbsp;</span>';