diff options
| author | Udo Walter | 2017-11-21 17:52:04 +0100 |
|---|---|---|
| committer | Udo Walter | 2017-11-21 17:52:04 +0100 |
| commit | 653851f35d0eea172c2302e9f1b6f0d03c70096c (patch) | |
| tree | 42f267c360104b98d2e3199273adba62a1e2023b /modules-available/exams | |
| parent | [internetaccess] reworked permission system from "click and you get error" to... (diff) | |
| parent | [statistics] Also adapt MAC-UUID fixing code to mltk changes (diff) | |
| download | slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.gz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.xz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.zip | |
Merge remote-tracking branch 'origin/master' into permission-manager
# Conflicts:
# modules-available/backup/templates/_page.html
# style/default.css
Diffstat (limited to 'modules-available/exams')
| -rw-r--r-- | modules-available/exams/baseconfig/getconfig.inc.php | 8 |
1 files changed, 5 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); } |