From 1f95b689d8c4b46cc055b45ad12dfa0c0c8794cf Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 14 Nov 2017 15:04:48 +0100 Subject: [exams/roomplanner] Smarter coordination of run mode (exam mode on/off etc) --- modules-available/exams/baseconfig/getconfig.inc.php | 8 +++++--- modules-available/roomplanner/baseconfig/getconfig.inc.php | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules-available/exams/baseconfig/getconfig.inc.php b/modules-available/exams/baseconfig/getconfig.inc.php index 325badb0..37a2caf4 100644 --- a/modules-available/exams/baseconfig/getconfig.inc.php +++ b/modules-available/exams/baseconfig/getconfig.inc.php @@ -7,11 +7,13 @@ if ($locations === false) { $locationIds = explode(' ', $locations); } if (Exams::isInExamMode($locationIds, $lectureId, $autoLogin)) { - ConfigHolder::add('SLX_EXAM', 'yes', 100000); + ConfigHolder::add('SLX_EXAM', 'yes', 10000); if (strlen($lectureId) > 0) { - ConfigHolder::add('SLX_EXAM_START', $lectureId, 100000); + ConfigHolder::add('SLX_EXAM_START', $lectureId, 10000); } if (strlen($autoLogin) > 0) { - ConfigHolder::add('SLX_AUTOLOGIN', $autoLogin, 100000); + ConfigHolder::add('SLX_AUTOLOGIN', $autoLogin, 10000); } + ConfigHolder::add('SLX_SYSTEMD_TARGET', 'exam-mode', 10000); + ConfigHolder::add("SLX_PVS_HYBRID", false, 10000); } diff --git a/modules-available/roomplanner/baseconfig/getconfig.inc.php b/modules-available/roomplanner/baseconfig/getconfig.inc.php index 92e7a8d3..aa8721ef 100644 --- a/modules-available/roomplanner/baseconfig/getconfig.inc.php +++ b/modules-available/roomplanner/baseconfig/getconfig.inc.php @@ -5,7 +5,10 @@ ConfigHolder::add("SLX_PVS_CONFIG_URL", 'http://' . $_SERVER['SERVER_ADDR'] . $_ $res = Database::queryFirst('SELECT dedicatedmgr FROM location_roomplan WHERE managerip = :ip LIMIT 1', ['ip' => $ip]); if ($res !== false) { if ((int)$res['dedicatedmgr'] !== 0) { + // TODO: Runmode ConfigHolder::add("SLX_PVS_DEDICATED", 'yes'); + ConfigHolder::add("SLX_EXAM", false, 100000); + ConfigHolder::add("SLX_SYSTEMD_TARGET", false, 100000); } else { ConfigHolder::add("SLX_PVS_HYBRID", 'yes'); } -- cgit v1.2.3-55-g7522