Skip to content

Fix DST-aware UTC conversion for EXDATE and RRULE UNTIL in iCal export #11553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrKrisKrisu wants to merge 1 commit into
base: release_11
Choose a base branch
from
+15 −6
Open

Fix DST-aware UTC conversion for EXDATE and RRULE UNTIL in iCal export #11553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/ILIAS/Calendar/classes/Export/class.ilCalendarExport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ protected function createRecurrences(ilCalendarEntry $app): ilICalWriter
$str_writer = new ilICalWriter();
foreach (ilCalendarRecurrences::_getRecurrences($app->getEntryId()) as $rec) {
foreach (ilCalendarRecurrenceExclusions::getExclusionDates($app->getEntryId()) as $excl) {
$str_writer->addLine($excl->toICal());
$str_writer->addLine($excl->toICal($this->il_user->getTimeZone()));
}
$recurrence_ical = $rec->toICal($this->il_user->getId());
if (strlen($recurrence_ical)) {
Expand Down
9 changes: 7 additions & 2 deletions components/ILIAS/Calendar/classes/class.ilCalendarRecurrence.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,13 @@ public function toICal(int $a_user_id): string
if ($entry->isFullday()) {
$ical .= (';UNTIL=' . $this->getFrequenceUntilDate()->get(IL_CAL_FKT_DATE, 'Ymd'));
} else {
$his = $entry->getStart()->get(IL_CAL_FKT_DATE, 'His');
$ical .= (';UNTIL=' . $this->getFrequenceUntilDate()->get(IL_CAL_FKT_DATE, 'Ymd') . 'T' . $his);
$user = new ilObjUser($a_user_id);
$tz = $user->getTimeZone();
$local_time = $entry->getStart()->get(IL_CAL_FKT_DATE, 'H:i:s', $tz);
$until_date = $this->getFrequenceUntilDate()->get(IL_CAL_FKT_DATE, 'Y-m-d');
$until_dt = new ilDateTime($until_date . ' ' . $local_time, IL_CAL_DATETIME, $tz);
$ical .= ';UNTIL=' . $until_dt->get(IL_CAL_FKT_DATE, 'Ymd', ilTimeZone::UTC) .
'T' . $until_dt->get(IL_CAL_FKT_DATE, 'His', ilTimeZone::UTC) . 'Z';
}
}
if ($this->getBYMONTH()) {
Expand Down
10 changes: 7 additions & 3 deletions components/ILIAS/Calendar/classes/class.ilCalendarRecurrenceExclusion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,21 @@ public function setDate(?ilDate $dt = null): void
$this->exclusion = $dt;
}

public function toICal(): string
public function toICal(string $a_tz = ''): string
{
$entry = new ilCalendarEntry($this->getEntryId());
$start = $entry->getStart();

if ($entry->isFullday()) {
return 'EXDATE;VALUE=DATE:' . $this->getDate()->get(IL_CAL_FKT_DATE, 'Ymd');
} else {
$tz = $a_tz ?: ilTimeZone::UTC;
$local_time = $start->get(IL_CAL_FKT_DATE, 'H:i:s', $tz);
$excl_date = $this->getDate()->get(IL_CAL_FKT_DATE, 'Y-m-d');
$excl_dt = new ilDateTime($excl_date . ' ' . $local_time, IL_CAL_DATETIME, $tz);
return 'EXDATE:' .
$this->getDate()->get(IL_CAL_FKT_DATE, 'Ymd', ilTimeZone::UTC) .
'T' . $start->get(IL_CAL_FKT_DATE, 'His', ilTimeZone::UTC) . 'Z';
$excl_dt->get(IL_CAL_FKT_DATE, 'Ymd', ilTimeZone::UTC) .
'T' . $excl_dt->get(IL_CAL_FKT_DATE, 'His', ilTimeZone::UTC) . 'Z';
}
}

Expand Down