diff options
| author | root | 2019-02-19 18:53:50 +0100 |
|---|---|---|
| committer | root | 2019-02-19 18:53:50 +0100 |
| commit | 0ad4c0f8196b61699754762aacbaab0223478ab9 (patch) | |
| tree | de434c4aea8d07ecd01cd3badd48d057d62c2d1b /modules-available/runmode/baseconfig/getconfig.inc.php | |
| parent | [usb-lock-off] Edit rule cleanup and fix of the dropdown boxes. (diff) | |
| parent | [statistics] Fix RAM change warning to handle increase too (diff) | |
| download | slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.gz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.tar.xz slx-admin-0ad4c0f8196b61699754762aacbaab0223478ab9.zip | |
Merge branch 'master' into usb-lock-offusb-lock-off
Diffstat (limited to 'modules-available/runmode/baseconfig/getconfig.inc.php')
| -rw-r--r-- | modules-available/runmode/baseconfig/getconfig.inc.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/modules-available/runmode/baseconfig/getconfig.inc.php b/modules-available/runmode/baseconfig/getconfig.inc.php index 2d622fc7..8ea2b2a6 100644 --- a/modules-available/runmode/baseconfig/getconfig.inc.php +++ b/modules-available/runmode/baseconfig/getconfig.inc.php @@ -6,21 +6,17 @@ $foofoo = function($machineUuid) { if ($res === false) return; $config = RunMode::getModuleConfig($res['module']); - if ($config === false || $config->configHook === false) + if ($config === false) return; if (!Module::isAvailable($res['module'])) return; // Not really possible because getModuleConfig would have failed but we should make sure - call_user_func($config->configHook, $machineUuid, $res['modeid'], $res['modedata']); + if ($config->configHook !== false) { + call_user_func($config->configHook, $machineUuid, $res['modeid'], $res['modedata']); + } if ($config->systemdDefaultTarget !== false) { ConfigHolder::add('SLX_SYSTEMD_TARGET', $config->systemdDefaultTarget, 10000); } - // Disable exam mode - not sure if this is generally a good idea; for now, all modes we can think of would - // not make sense that way so do this for now - if (ConfigHolder::get('SLX_EXAM') !== false) { - ConfigHolder::add('SLX_EXAM', '', 100001); - ConfigHolder::add('SLX_EXAM_START', '', 100001); - ConfigHolder::add('SLX_AUTOLOGIN', '', 100001); - } + ConfigHolder::add('SLX_RUNMODE_MODULE', $res['module']); }; $foofoo($uuid);
\ No newline at end of file |