tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

Browse Source
This commit is contained in:
Jose Gonzalez 2023-03-07 14:11:23 +01:00
commit f01b18b965
7 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/agentes/module_manager_editor.php
View File

@ -802,7 +802,7 @@ if ($id_agent_module) {
__('Delete'), __('Delete'),
'deleteModule', 'deleteModule',
false, false,
'window.location.assign(\'index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&delete_module='.$id_agent_module.')', 'window.location.assign("index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&delete_module='.$id_agent_module.'")',
[ [
'icon' => 'delete', 'icon' => 'delete',
'mode' => 'secondary', 'mode' => 'secondary',

2
pandora_console/godmode/agentes/module_manager_editor_network.php
View File

@ -524,7 +524,7 @@ $data[0] .= html_print_button(
__('Manage credentials'), __('Manage credentials'),
'manage_credentials_button', 'manage_credentials_button',
false, false,
'window.location.assign(\'index.php?sec=gmodules&sec2=godmode/groups/group_list&tab=credbox\')', 'window.location.assign("index.php?sec=gmodules&sec2=godmode/groups/group_list&tab=credbox")',
[ 'mode' => 'link' ], [ 'mode' => 'link' ],
true true
); );

47
pandora_console/godmode/modules/manage_inventory_modules.php
View File

@ -351,22 +351,51 @@ if ($result === false) {
html_print_input_hidden('multiple_delete', 1); html_print_input_hidden('multiple_delete', 1);
html_print_table($table); html_print_table($table);
echo '</form>'; echo '</form>';
$tablePagination = ui_pagination($total_modules, 'index.php?sec='.$sec.'&sec2=godmode/modules/manage_inventory_modules', $offset, 0, true, 'offset', false);
$actionButtons = []; echo '<form id="form_create" method="post" action="index.php?sec='.$sec.'&sec2=godmode/modules/manage_inventory_modules_form">';
echo html_print_input_hidden('create_module_inventory', 1);
echo '<form>';
$tablePagination = ui_pagination(
$total_modules,
'index.php?sec='.$sec.'&sec2=godmode/modules/manage_inventory_modules',
$offset,
0,
true,
'offset',
false
);
$actionButtons = '';
if ($management_allowed === true) { if ($management_allowed === true) {
$actionButtons[] = html_print_submit_button(__('Delete'), 'delete_btn', false, ['icon' => 'delete', 'mode' => 'secondary', 'form' => 'form_delete'], true); $actionButtons .= html_print_submit_button(
$actionButtons[] = html_print_submit_button(__('Create'), 'crt', false, ['icon' => 'wand', 'form' => 'form_create'], true); __('Delete'),
'delete_btn',
false,
[
'icon' => 'delete',
'mode' => 'secondary',
'form' => 'form_delete',
],
true
);
$actionButtons[] = '<form id="form_create" method="post" action="index.php?sec='.$sec.'&sec2=godmode/modules/manage_inventory_modules_form">';
$actionButtons[] = html_print_input_hidden('create_module_inventory', 1, true); $actionButtons .= html_print_submit_button(
$actionButtons[] = '<form>'; __('Create'),
'crt',
false,
[
'icon' => 'wand',
'form' => 'form_create',
],
true
);
} }
html_print_action_buttons( html_print_action_buttons(
implode('', $actionButtons), $actionButtons,
[ [
'type' => 'form_action', 'type' => 'form_action',
'right_content' => $tablePagination, 'right_content' => $tablePagination,

4
pandora_console/include/ajax/module.php
View File

@ -1283,7 +1283,7 @@ if (check_login()) {
$linkCaption, $linkCaption,
'additional_action_for_'.$idAgenteModulo, 'additional_action_for_'.$idAgenteModulo,
false, false,
'window.location.assign(\'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60'.$addedLinkParams.'\')', 'window.location.assign("index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60'.$addedLinkParams.'")',
[ [
'mode' => 'link', 'mode' => 'link',
'style' => 'justify-content: flex-end;', 'style' => 'justify-content: flex-end;',
@ -1300,7 +1300,7 @@ if (check_login()) {
__('Edit'), __('Edit'),
'edit_module_'.$idAgenteModulo, 'edit_module_'.$idAgenteModulo,
false, false,
'window.location.assign(\'index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module['id_agente_modulo'].'&amp;edit_module='.$module['id_modulo'].'\')', 'window.location.assign("index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module['id_agente_modulo'].'&amp;edit_module='.$module['id_modulo'].'")',
[ [
'mode' => 'link', 'mode' => 'link',
'style' => 'justify-content: flex-end;', 'style' => 'justify-content: flex-end;',

2
pandora_console/include/functions_treeview.php
View File

@ -467,7 +467,7 @@ function treeview_printAlertsTable($id_module, $server_data=[], $no_head=false)
__('Go to alerts edition'), __('Go to alerts edition'),
'upd_button', 'upd_button',
false, false,
'window.location.assign(\''.$console_url.'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&search=1&module_name='.$module_name.'&id_agente='.$agent_id.$url_hash.'\')', 'window.location.assign("'.$console_url.'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&search=1&module_name='.$module_name.'&id_agente='.$agent_id.$url_hash.'")',
['icon' => 'alert'], ['icon' => 'alert'],
true true
), ),

2
pandora_console/include/functions_ui.php
View File

@ -1210,7 +1210,7 @@ function ui_format_alert_row(
$forceTitle, $forceTitle,
'force_execution_'.$alert['id'], 'force_execution_'.$alert['id'],
false, false,
'window.location.assign(\''.$url.'&amp;id_alert='.$alert['id'].'&amp;refr=60'.$additionUrl.'\');', 'window.location.assign("'.$url.'&amp;id_alert='.$alert['id'].'&amp;refr=60'.$additionUrl.'");',
[ 'mode' => 'link' ], [ 'mode' => 'link' ],
true true
); );

4
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -396,7 +396,7 @@ $buttonsRefreshAgent = html_print_button(
__('Refresh data'), __('Refresh data'),
'refresh_data', 'refresh_data',
false, false,
'window.location.assign(\'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;refr=60\')', 'window.location.assign("index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;refr=60")',
[ 'mode' => 'link' ], [ 'mode' => 'link' ],
true true
); );
@ -406,7 +406,7 @@ if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') === true) {
__('Force checks'), __('Force checks'),
'force_checks', 'force_checks',
false, false,
'window.location.assign(\'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;id_agente='.$id_agente.'\')', 'window.location.assign("index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;id_agente='.$id_agente.'")',
[ 'mode' => 'link' ], [ 'mode' => 'link' ],
true true
); );