diff options
| author | Simon Rettberg | 2019-12-13 16:14:31 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-12-13 16:14:31 +0100 |
| commit | 47e0a78776dd998952365c1cd387e6b21f58a5de (patch) | |
| tree | 50fea55d680c084fbdefd9cfb2c5b6b39bca8aa4 | |
| parent | [statistics/baseconfig] Redirect to machine details after editing (diff) | |
| download | slx-admin-47e0a78776dd998952365c1cd387e6b21f58a5de.tar.gz slx-admin-47e0a78776dd998952365c1cd387e6b21f58a5de.tar.xz slx-admin-47e0a78776dd998952365c1cd387e6b21f58a5de.zip | |
[locationinfo] Don't disable SLX_ADDONS in split-login mode
| -rw-r--r-- | modules-available/locationinfo/inc/locationinfohooks.inc.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules-available/locationinfo/inc/locationinfohooks.inc.php b/modules-available/locationinfo/inc/locationinfohooks.inc.php index b10be51b..b7bdda14 100644 --- a/modules-available/locationinfo/inc/locationinfohooks.inc.php +++ b/modules-available/locationinfo/inc/locationinfohooks.inc.php @@ -44,6 +44,7 @@ class LocationInfoHooks } else { // Automatic login RunMode::updateClientFlag($machineUuid, 'locationinfo', false); ConfigHolder::add('SLX_AUTOLOGIN', '1', 1000); + ConfigHolder::add('SLX_ADDONS', '', 1000); } if (isset($data['interactive']) && $data['interactive']) { ConfigHolder::add('SLX_BROWSER_INTERACTIVE', '1', 1000); @@ -64,8 +65,8 @@ class LocationInfoHooks ConfigHolder::add('SLX_BROWSER_URL', 'http://' . $_SERVER['SERVER_ADDR'] . '/panel/' . $panelUuid); ConfigHolder::add('SLX_BROWSER_INSECURE', '1'); // TODO: Sat server might redirect to HTTPS, which in turn could have a self-signed cert - push to client ConfigHolder::add('SLX_AUTOLOGIN', '1', 1000); + ConfigHolder::add('SLX_ADDONS', '', 1000); } - ConfigHolder::add('SLX_ADDONS', '', 1000); ConfigHolder::add('SLX_LOGOUT_TIMEOUT', '', 1000); ConfigHolder::add('SLX_SCREEN_STANDBY_TIMEOUT', '', 1000); ConfigHolder::add('SLX_SYSTEM_STANDBY_TIMEOUT', '', 1000); |