nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-01-27 00:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch event expansion to use vComponent.php rather than iCalendar.

Browse Source
This commit is contained in:
Andrew McMillan 2010-08-30 17:02:17 +12:00
parent 31400d3d7e
commit 845db16c55
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/caldav-REPORT-calquery.php
View File

@ -318,8 +318,8 @@ if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows() > 0 ) {
$calendar_object->dav_name = str_replace( $bound_from, $target_collection->dav_name(), $calendar_object->dav_name);
}
if ( $need_expansion ) {
$ics = new iCalComponent($calendar_object->caldav_data);
$expanded = expand_event_instances($ics, $expand_range_start, $expand_range_end);
$vResource = new vComponent($calendar_object->caldav_data);
$expanded = expand_event_instances($vResource, $expand_range_start, $expand_range_end);
$calendar_object->caldav_data = $expanded->Render();
}
$responses[] = calendar_to_xml( $properties, $calendar_object );

4
inc/caldav-REPORT-multiget.php
View File

@ -104,8 +104,8 @@ if ( $qry->Exec('REPORT',__LINE__,__FILE__) && $qry->rows() > 0 ) {
$dav_object->dav_name = str_replace( $bound_from, $collection->dav_name(), $dav_object->dav_name);
}
if ( $need_expansion ) {
$ics = new iCalComponent($dav_object->caldav_data);
$expanded = expand_event_instances($ics, $expand_range_start, $expand_range_end);
$vResource = new vComponent($dav_object->caldav_data);
$expanded = expand_event_instances($vResource, $expand_range_start, $expand_range_end);
$dav_object->caldav_data = $expanded->Render();
}
$responses[] = component_to_xml( $properties, $dav_object );