From 4129833a3804779ce8f7d9b07affc379d40c3606 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 1 Sep 2023 11:44:12 +0200 Subject: [PATCH 1/2] #11026 message update only for token enable --- .../include/class/ConsoleSupervisor.php | 24 ++++++++++--------- pandora_console/include/styles/pandora.css | 1 + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index f6d3767708..97e613cc20 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -2373,17 +2373,19 @@ class ConsoleSupervisor include_once $config['homedir'].'/include/functions_update_manager.php'; $login = get_parameter('login', false); - if (update_manager_verify_registration() === false) { - $this->notify( - [ - 'type' => 'NOTIF.UPDATEMANAGER.REGISTRATION', - 'title' => __('This instance is not registered in the Update manager section'), - 'message' => __('Click here to start the registration process'), - 'url' => '__url__/index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online', - ] - ); - } else { - $this->cleanNotifications('NOTIF.UPDATEMANAGER.REGISTRATION'); + if ($config['autoupdate'] === true || $_GET['sec2'] === 'godmode/update_manager/update_manager') { + if (update_manager_verify_registration() === false) { + $this->notify( + [ + 'type' => 'NOTIF.UPDATEMANAGER.REGISTRATION', + 'title' => __('This instance is not registered in the Update manager section'), + 'message' => __('Click here to start the registration process'), + 'url' => '__url__/index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online', + ] + ); + } else { + $this->cleanNotifications('NOTIF.UPDATEMANAGER.REGISTRATION'); + } } } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index abbb50c927..573ac1a40c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4928,6 +4928,7 @@ div#dialog_messages table th:last-child { margin-top: 55px; border-radius: 5px; max-height: 530px; + position: fixed; } #notification-wrapper::before { From aa6aa08df3b7494840030536748616cefb882d2f Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 20 Nov 2023 14:49:26 +0100 Subject: [PATCH 2/2] #11026 autoupdate as string --- pandora_console/include/class/ConsoleSupervisor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 206be57fd9..aa3e951b25 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -2390,7 +2390,7 @@ class ConsoleSupervisor include_once $config['homedir'].'/include/functions_update_manager.php'; $login = get_parameter('login', false); - if ($config['autoupdate'] === true || $_GET['sec2'] === 'godmode/update_manager/update_manager') { + if ($config['autoupdate'] === '1' || $_GET['sec2'] === 'godmode/update_manager/update_manager') { if (update_manager_verify_registration() === false) { $this->notify( [