[pull] develop from LibreBooking:develop - #589
Merged
Merged
Conversation
Replace the Smarty-templated ICS renderer with programmatic VCALENDAR/VEVENT/VALARM construction via sabre/vobject and remove the now-unused tpl/Export/ical.tpl. Render() also accepts an optional $calendarName, emitted as NAME/X-WR-CALNAME, for use by subscription feeds. ExtraIcalLines (plugin-supplied raw ICS text) is parsed with Sabre's own Reader, wrapped in a throwaway VCALENDAR/VEVENT shell, instead of being concatenated into the template output verbatim. That preserves property parameters (e.g. ATTENDEE;CN=...), nested components (e.g. BEGIN:VALARM), and RFC 5545 line folding, and it stops a plugin from injecting arbitrary calendar structure. A caught ParseException skips only the malformed fragment so one bad plugin-supplied fragment can't break the whole feed. iCalendarReservationView no longer pre-escapes SUMMARY/DESCRIPTION for RFC 5545 (removes toRfc5545Text): Sabre's serializer already escapes TEXT values, so the old pre-escaping caused reserved characters and newlines to be double-escaped in the output. Assisted-by: Claude:claude-sonnet-5
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )