diff --git a/events.php b/events.php index 5b0757b9006eeb09990b2fd542de3644c7fb340d..b95c8dea0910a1d567474f43619f54e8649963dc 100644 --- a/events.php +++ b/events.php @@ -15,15 +15,7 @@ $output = "BEGIN:VCALENDAR VERSION:2.0 METHOD:PUBLISH PRODID:-//Sam events//NONSGML//EN -X-WR-CALNAME:Sam events -BEGIN:VTIMEZONE -TZID:UTC -BEGIN:STANDARD -TZOFFSETFROM:+0000 -TZOFFSETTO:+0000 -DTSTART:".gmdate(DATE_ICAL)." -END:STANDARD -END:VTIMEZONE\n\n"; +X-WR-CALNAME:Sam events\n\n"; // get events $events = $bdd->prepare('SELECT id, title, date, place, description @@ -34,19 +26,11 @@ $events->execute(); // loop over events while ($event = $events->fetch()) { $output .= -"BEGIN:VTIMEZONE -TZID:Europe/Paris -BEGIN:STANDARD -TZOFFSETFROM:+0100 -TZOFFSETTO:+0100 -DTSTART;TZID=UTC:".gmdate(DATE_ICAL)." -END:STANDARD -END:VTIMEZONE -BEGIN:VEVENT +"BEGIN:VEVENT UID:".$event[0]." -DTSTAMP;TZID=Europe/Paris:".gmdate(DATE_ICAL)." -DTSTART;TZID=UTC;TZID=Europe/Paris:" . date(DATE_ICAL, $event[2]) . " -DTEND;TZID=UTC;TZID=Europe/Paris:" . date(DATE_ICAL, $event[2] + 5*3600) . " +DTSTAMP:".gmdate(DATE_ICAL)." +DTSTART:" . gmdate(DATE_ICAL, $event[2]) . " +DTEND:" . gmdate(DATE_ICAL, $event[2] + 5*3600) . " SUMMARY:".str_replace(',', '\\,', $event[1])." DESCRIPTION:".str_replace(',', '\\,', $event[4])." LOCATION:".$event[3]." diff --git a/index.php b/index.php index fda78a89abed63073da3898cd83fa7350ed02590..3d5eb26b2a1bdf005cc0ba767235f6ccde756710 100644 --- a/index.php +++ b/index.php @@ -17,6 +17,7 @@ $app->get( $events = $bdd->prepare('SELECT id, title, date, place, description FROM sam + WHERE date > '.time().' ORDER BY date'); $events->execute();