beenull/calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #31: .ICS attachment Convert DateTimeImmutable before trying to format it

Browse source 
closes #31
This commit is contained in:
Gwendal Roulleau 2022-09-26 00:45:17 +02:00
parent f0a90df1d3
commit 9d98989062
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
calendar.php
View file

@ -3180,6 +3180,19 @@ $("#rcmfd_new_category").keypress(function(event) {
) . $hidden->show();
}
/**
* Escape DateTimeImmutableObject to DateTime if necessary
*/
private function sanitize_date_time_immutable($date)
{
$dateclone = clone $date;
if (is_object($dateclone) && is_a($dateclone, 'DateTimeImmutable')) {
return DateTime::createFromImmutable($dateclone);
} else {
return $dateclone;
}
}
/**
*
*/
@ -3189,8 +3202,8 @@ $("#rcmfd_new_category").keypress(function(event) {
$time = $this->gettext('all-day');
}
else {
$start = is_object($event['start']) ? clone $event['start'] : $event['start'];
$end = is_object($event['end']) ? clone $event['end'] : $event['end'];
$start = is_object($event['start']) ? $this->sanitize_date_time_immutable($event['start']) : $event['start'];
$end = is_object($event['end']) ? $this->sanitize_date_time_immutable($event['end']) : $event['end'];
$time = $this->rc->format_date($start, $this->rc->config->get('time_format'))
. ' - ' . $this->rc->format_date($end, $this->rc->config->get('time_format'));
@ -3259,7 +3272,7 @@ $("#rcmfd_new_category").keypress(function(event) {
// get prepared inline UI for this event object
if ($ical_objects->method) {
$append = '';
$date_str = $this->rc->format_date(clone $event['start'], $this->rc->config->get('date_format'), empty($event['start']->_dateonly));
$date_str = $this->rc->format_date($this->sanitize_date_time_immutable($event['start']), $this->rc->config->get('date_format'), empty($event['start']->_dateonly));
$date = new DateTime($event['start']->format('Y-m-d') . ' 12:00:00', new DateTimeZone('UTC'));
// prepare a small agenda preview to be filled with actual event data on async request