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-7883-aplicacion-de-parches-offline-en-la-open' into 'develop' 

Allowed UMC offline for opensource installations, fixed issue while accessing settings

See merge request artica/pandorafms!4349
This commit is contained in:
Daniel Rodriguez 2021-08-11 12:20:32 +00:00
parent d2cc7d2f31 3662d8b8a0
commit 03306454e0
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/menu.php
View File

@ -525,10 +525,8 @@ if (check_acl($config['id_user'], 0, 'PM') && $config['enable_update_manager'])
$menu_godmode['messages']['id'] = 'god-um_messages'; $menu_godmode['messages']['id'] = 'god-um_messages';
$sub = []; $sub = [];
if ($config['enterprise_installed']) { $sub['godmode/update_manager/update_manager&tab=offline']['text'] = __('Update Manager offline');
$sub['godmode/update_manager/update_manager&tab=offline']['text'] = __('Update Manager offline'); $sub['godmode/update_manager/update_manager&tab=offline']['id'] = 'Offline';
$sub['godmode/update_manager/update_manager&tab=offline']['id'] = 'Offline';
}
$sub['godmode/update_manager/update_manager&tab=online']['text'] = __('Update Manager online'); $sub['godmode/update_manager/update_manager&tab=online']['text'] = __('Update Manager online');
$sub['godmode/update_manager/update_manager&tab=online']['id'] = 'Online'; $sub['godmode/update_manager/update_manager&tab=online']['id'] = 'Online';

6
pandora_console/godmode/um_client/index.php
View File

@ -327,6 +327,12 @@ if (is_array($config) === true) {
) { ) {
ui_print_error_message(__('Update manager online requires registration.')); ui_print_error_message(__('Update manager online requires registration.'));
} }
if ($mode === Manager::MODE_OFFLINE) {
ui_print_warning_message(
__('Applying offline patches may make your console unusable, we recommend to completely backup your files before applying any patch.')
);
}
} }
$url_update_manager = $config['url_update_manager']; $url_update_manager = $config['url_update_manager'];

11
pandora_console/godmode/update_manager/update_manager.php
View File

@ -37,12 +37,10 @@ $buttons['setup'] = [
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup">'.html_print_image('images/gm_setup.png', true, ['title' => __('Options'), 'class' => 'invert_filter']).'</a>', 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup">'.html_print_image('images/gm_setup.png', true, ['title' => __('Options'), 'class' => 'invert_filter']).'</a>',
]; ];
if (enterprise_installed()) { $buttons['offline'] = [
$buttons['offline'] = [ 'active' => ($tab == 'offline') ? true : false,
'active' => ($tab == 'offline') ? true : false, 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=offline">'.html_print_image('images/box.png', true, ['title' => __('Offline update manager'), 'class' => 'invert_filter']).'</a>',
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=offline">'.html_print_image('images/box.png', true, ['title' => __('Offline update manager'), 'class' => 'invert_filter']).'</a>', ];
];
}
$buttons['online'] = [ $buttons['online'] = [
'active' => ($tab == 'online') ? true : false, 'active' => ($tab == 'online') ? true : false,
@ -60,6 +58,7 @@ switch ($tab) {
break; break;
case 'online': case 'online':
default:
$title = __('Update manager » Online'); $title = __('Update manager » Online');
break; break;
} }

1
pandora_console/godmode/update_manager/update_manager.setup.php
View File

@ -30,6 +30,7 @@
global $config; global $config;
require_once __DIR__.'/../../include/functions_users.php'; require_once __DIR__.'/../../include/functions_users.php';
require_once __DIR__.'/../../include/functions_update_manager.php';
check_login(); check_login();