From aa2c188c787bdf797bded5020ddd682bef29c99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9drix?= <cedric@abonnel.fr>
Date: Tue, 5 May 2026 23:47:16 +0200
Subject: [PATCH] Corriger l'URL du calendrier et le parsing des dates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Passe à l'URL Nextcloud directe (le proxy alpinux.org retourne vide)
- Corrige le parsing DTSTART avec TZID (Europe/Paris) et UTC (suffixe Z)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 web/inc/calendar.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/inc/calendar.php b/web/inc/calendar.php
index 05c1913..7d06811 100644
--- a/web/inc/calendar.php
+++ b/web/inc/calendar.php
@@ -1,7 +1,7 @@
 <?php
 
 function calendar_next_events(int $n = 5): array {
-    $url   = 'https://alpinux.org/public-calendars/n5BWPYsxw7FCYozM?p=webcal';
+    $url   = 'https://alpinux.yourownnet.fr/remote.php/dav/public-calendars/n5BWPYsxw7FCYozM?export';
     $cache = sys_get_temp_dir() . '/alpinux_calendar.ics';
     $ttl   = 3600;
 
@@ -30,11 +30,16 @@ function _ical_upcoming(string $ical, int $n): array {
         if (preg_match('/^LOCATION[^:]*:(.+)$/m', $b, $m))
             $e['location'] = trim($m[1]);
 
-        if (preg_match('/^DTSTART[^:]*:(\d+)/m', $b, $m)) {
-            $r = $m[1];
-            $e['start'] = strlen($r) === 8
-                ? mktime(0, 0, 0, substr($r, 4, 2), substr($r, 6, 2), substr($r, 0, 4))
-                : strtotime($r);
+        // Handles: DTSTART:YYYYMMDD, DTSTART:YYYYMMDDTHHmmss[Z], DTSTART;TZID=...:YYYYMMDDTHHmmss
+        if (preg_match('/^DTSTART(?:;[^:]+)?:([\dTZ]+)/m', $b, $m)) {
+            $raw = $m[1];
+            if (strlen($raw) === 8) {
+                $e['start'] = mktime(0, 0, 0, (int)substr($raw, 4, 2), (int)substr($raw, 6, 2), (int)substr($raw, 0, 4));
+            } else {
+                $dt = DateTime::createFromFormat('Ymd\THis\Z', $raw, new DateTimeZone('UTC'))
+                   ?: DateTime::createFromFormat('Ymd\THis',  $raw, new DateTimeZone('Europe/Paris'));
+                if ($dt) $e['start'] = $dt->getTimestamp();
+            }
         }
 
         if (isset($e['start'], $e['title']) && $e['start'] >= $now)