From 02d163ae792732440f064f663511a63bfc0f8671 Mon Sep 17 00:00:00 2001 From: Patrick Schwarz Date: Sun, 23 Apr 2023 20:10:15 +0200 Subject: [PATCH] Update Date Formatting for php8.1 --- index.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 2ae270f..9293e7b 100644 --- a/index.php +++ b/index.php @@ -1,9 +1,9 @@ categories) && strpos($event->categories, "hidden")) { + continue; + } + $start = new DateTime($event->dtstart); $end = new DateTime($event->dtend); $uid = $event->uid; @@ -44,15 +48,18 @@ foreach ($events as $event) { foreach ($period as $dt) { $date = $dt->format("Y-m-d"); - $result[$date]["name"] = strftime('%e. %B %Y', $dt->getTimestamp()); - $result[$date]["weekday"] = strftime('%A', $dt->getTimestamp()); + $dateFormatter = new IntlDateFormatter('de_DE', IntlDateFormatter::LONG, IntlDateFormatter::NONE, 'Europe/Berlin', IntlDateFormatter::GREGORIAN); + $weekdayFormatter = new IntlDateFormatter('de_DE', IntlDateFormatter::NONE, IntlDateFormatter::NONE, 'Europe/Berlin', IntlDateFormatter::GREGORIAN, 'EEEE'); + + $result[$date]["name"] = $dateFormatter->format($dt->getTimestamp()); + $result[$date]["weekday"] = $weekdayFormatter->format($dt->getTimestamp()); $result[$date]["events"][$uid]["dtstart"] = $event->dtstart; #TODO: Zeitzone aus lib auslesen $result[$date]["events"][$uid]["dtend"] = $event->dtend; #TODO: Zeitzone aus lib auslesen $result[$date]["events"][$uid]["datestr"] = (isset($event->dtstart_array[0]["VALUE"]) && $event->dtstart_array[0]["VALUE"] == 'DATE')?'Ganztägig':$start->format('H:i'); $result[$date]["events"][$uid]["summary"] = $event->summary; $result[$date]["events"][$uid]["location"] = $event->location; $result[$date]["events"][$uid]["description"] = $event->description; - $result[$date]["events"][$uid]["categories"] = $event->categories; + if(isset($event->categories)) $result[$date]["events"][$uid]["categories"] = $event->categories; } }