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

Fix RRULE expansion handling.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-12 18:32:46 +13:00
parent c2b6398afe
commit b4e2a14552
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
<?php <?php
require_once('PgQuery.php');
$need_expansion = false; $need_expansion = false;
function check_for_expansion( $calendar_data_node ) { function check_for_expansion( $calendar_data_node ) {
global $need_expansion, $expand_range_start, $expand_range_end; global $need_expansion, $expand_range_start, $expand_range_end;
@ -287,7 +289,11 @@ $qry = new PgQuery( $sql );
if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows > 0 ) { if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows > 0 ) {
while( $calendar_object = $qry->Fetch() ) { while( $calendar_object = $qry->Fetch() ) {
if ( !$need_post_filter || apply_filter( $qry_filters, $calendar_object ) ) { if ( !$need_post_filter || apply_filter( $qry_filters, $calendar_object ) ) {
if ( $need_expansion ) expand_event_instances($ics, $expand_range_start, $expand_range_end); if ( $need_expansion ) {
$ics = new iCalComponent($calendar_object->caldav_data);
$expanded = expand_event_instances($ics, $expand_range_start, $expand_range_end);
$calendar_object->caldav_data = $expanded->Render();
}
$responses[] = calendar_to_xml( $properties, $calendar_object ); $responses[] = calendar_to_xml( $properties, $calendar_object );
} }
} }