diff options
| author | Simon Rettberg | 2026-01-28 15:45:21 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2026-01-28 15:45:21 +0100 |
| commit | 153b4212c2d7e8c2edff52352f3cecd6038fb97c (patch) | |
| tree | d68b6923579c5c913cc8fc0c56f14001fc55f8f7 /modules-available/locationinfo/inc/icalcoursebackend.inc.php | |
| parent | [serversetup-bwlp-ipxe] Fix: Don't clear screen between menus (diff) | |
| download | slx-admin-153b4212c2d7e8c2edff52352f3cecd6038fb97c.tar.gz slx-admin-153b4212c2d7e8c2edff52352f3cecd6038fb97c.tar.xz slx-admin-153b4212c2d7e8c2edff52352f3cecd6038fb97c.zip | |
[locationinfo] Revert HisInOne calendar workaround
The hack introduced in 87686da817dfd349c9f89a01065f799408e29f10 to work
around HisInOne returning incomplete data in ical files is obsolete, now
that HisInOne seems to have fixed this bug.
Diffstat (limited to 'modules-available/locationinfo/inc/icalcoursebackend.inc.php')
| -rw-r--r-- | modules-available/locationinfo/inc/icalcoursebackend.inc.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules-available/locationinfo/inc/icalcoursebackend.inc.php b/modules-available/locationinfo/inc/icalcoursebackend.inc.php index c9113ec6..493d0008 100644 --- a/modules-available/locationinfo/inc/icalcoursebackend.inc.php +++ b/modules-available/locationinfo/inc/icalcoursebackend.inc.php @@ -38,17 +38,16 @@ abstract class ICalCourseBackend extends CourseBackend * * @param string $roomId The ID of the room for which iCal data is to be downloaded. * @param ?int $deadline Optional deadline timestamp for the download operation. - * @param ?string $appendToUrl Optional appendage to the URL used for the download. * * @return ?ICalEvent[] An array of iCal events if successful, or null on failure. */ - protected function downloadIcal(string $roomId, ?int $deadline, ?string $appendToUrl = null, ?bool $limitRange = true): ?array + protected function downloadIcal(string $roomId, ?int $deadline): ?array { if (!$this->isOK()) return null; try { - $ical = new ICalParser($limitRange ? ['filterDaysBefore' => 7, 'filterDaysAfter' => 7] : []); + $ical = new ICalParser(['filterDaysBefore' => 7, 'filterDaysAfter' => 7]); } catch (Exception $e) { $this->addError('Error instantiating ICalParser: ' . $e->getMessage(), true); return null; @@ -70,7 +69,7 @@ abstract class ICalCourseBackend extends CourseBackend CURLOPT_FOLLOWLOCATION => true, CURLOPT_SSL_VERIFYHOST => $this->verifyHostname ? 2 : 0, CURLOPT_SSL_VERIFYPEER => $this->verifyCert ? 1 : 0, - CURLOPT_URL => str_replace('%ID%', $roomId, $this->location . ($appendToUrl ?? '')), + CURLOPT_URL => str_replace('%ID%', $roomId, $this->location), CURLOPT_TIMEOUT => min(20, $timeout), CURLOPT_CONNECTTIMEOUT => 4, ]; |
