summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2025-07-24 10:43:28 +0200
committerSimon Rettberg2025-07-24 10:43:28 +0200
commit4a93387723d2b656dd99b42c831b482f52eab5b5 (patch)
tree99e246e0ffa399b33318e41c40e2629e67fa85c7
parent[roomplanner] Initialize with empty roomplan if none exists (diff)
downloadslx-admin-4a93387723d2b656dd99b42c831b482f52eab5b5.tar.gz
slx-admin-4a93387723d2b656dd99b42c831b482f52eab5b5.tar.xz
slx-admin-4a93387723d2b656dd99b42c831b482f52eab5b5.zip
[locationinfo] Fix saving DEFAULT panel name; bail out if timeout exceeded
-rw-r--r--modules-available/locationinfo/inc/icalcoursebackend.inc.php2
-rw-r--r--modules-available/locationinfo/templates/page-config-panel-default.html2
2 files changed, 3 insertions, 1 deletions
diff --git a/modules-available/locationinfo/inc/icalcoursebackend.inc.php b/modules-available/locationinfo/inc/icalcoursebackend.inc.php
index de7ddb00..c371fba2 100644
--- a/modules-available/locationinfo/inc/icalcoursebackend.inc.php
+++ b/modules-available/locationinfo/inc/icalcoursebackend.inc.php
@@ -59,6 +59,8 @@ abstract class ICalCourseBackend extends CourseBackend
}
$timeout = ($deadline ?? PHP_INT_MAX) - time();
+ if ($timeout < 1)
+ return null;
$options = [
CURLOPT_WRITEFUNCTION => function ($ch, $data) use ($ical) {
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index a289d26a..cba66745 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -28,7 +28,7 @@
<label for="panel-title">{{lang_displayName}}</label>
</div>
<div class="col-sm-8">
- <input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
+ <input class="form-control" name="panelname" id="panel-title" type="text" value="{{panelname}}">
</div>
<div class="col-sm-12 small text-muted spacebottop">
{{lang_displayNameTooltip}}