From ef07eff769c6a765cd7d3f5c130e8f8afcb95732 Mon Sep 17 00:00:00 2001 From: Fermin Date: Mon, 21 May 2018 11:07:39 +0200 Subject: [PATCH] [Rebranding] Added enable update manager option --- pandora_console/godmode/menu.php | 2 +- pandora_console/include/functions_config.php | 6 ++++++ pandora_console/include/functions_db.php | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 11f510349a..2735619b16 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -435,7 +435,7 @@ foreach ($rows as $row) { $menu_godmode["links"]["sub"] = $sub; // Update Manager -if (check_acl ($config['id_user'], 0, "PM")) { +if (check_acl ($config['id_user'], 0, "PM") && $config['enable_update_manager']) { $menu_godmode["messages"]["text"] = __('Update manager'); $menu_godmode["messages"]["sec2"] = ""; $menu_godmode["messages"]["id"] = "god-um_messages"; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index fd27a72723..317e41e087 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -251,6 +251,8 @@ function config_update_config () { $error_update[] = __('Product name'); if (!config_update_value ('rb_copyright_notice', get_parameter('rb_copyright_notice'))) $error_update[] = __('Copyright notice'); + if (!config_update_value ('enable_update_manager', get_parameter('enable_update_manager'))) + $error_update[] = __('Enable Update Manager'); $inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array()); if (!config_update_value ('inventory_changes_blacklist', implode(',',$inventory_changes_blacklist))) @@ -1059,6 +1061,10 @@ function config_process_config () { config_update_value('rb_copyright_notice', get_copyright_notice()); } + if (!isset ($config["enable_update_manager"])) { + config_update_value ('enable_update_manager', 1); + } + if (!isset ($config["reset_pass_option"])) { config_update_value ('reset_pass_option', 0); } diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 9acd28b98e..b069b4d993 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -1744,6 +1744,8 @@ function db_process_file ($path, $handle_error = true) { */ function db_check_minor_relase_available () { global $config; + + if (!$config['enable_update_manager']) return false; $dir = $config["homedir"]."/extras/mr"; @@ -1788,6 +1790,8 @@ function db_check_minor_relase_available () { function db_check_minor_relase_available_to_um ($package, $ent, $offline) { global $config; + if (!$config['enable_update_manager']) return false; + if (!$ent) { $dir = $config['attachment_store'] . "/downloads/pandora_console/extras/mr"; }