nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-24 17:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow adding an 'after=YYYY-MM-DD' or 'after=P72D' parameter

Browse Source 
Only applies to PUT of a collection.  This will mean that only events
after that date (or absolute duration prior to today).  All repeating
events will still be included.
This commit is contained in:
Andrew McMillan 2013-05-23 13:37:00 +12:00
parent 115676613d
commit 5200c6d996
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
inc/caldav-PUT-functions.php
View File

@ -782,6 +782,20 @@ function import_calendar_collection( $ics_content, $user_no, $path, $caldav_cont
$timezones = $calendar->GetComponents('VTIMEZONE',true);
$components = $calendar->GetComponents('VTIMEZONE',false);
// Add a parameter to calendars on import so it will only load events 'after' @author karora
// date, or an RFC5545 duration format offset from the current date.
$after = '20000101T000000Z';
if ( isset($_GET['after']) ) $after = $_GET['after'];
if ( strtoupper(substr($after, 0, 1)) == 'P' ) {
$duration = new Rfc5545Duration($after);
$duration = $duration->asSeconds();
$after = time() - (abs($duration));
}
else {
$after = new RepeatRuleDateTime($after);
$after = $after->epoch();
}
$displayname = $calendar->GetPValue('X-WR-CALNAME');
if ( !$appending && isset($displayname) ) {
$sql = 'UPDATE collection SET dav_displayname = :displayname WHERE dav_name = :dav_name';
@ -916,6 +930,11 @@ EOSQL;
$dtstart = $first->GetPValue('DUE');
}
$calitem_params[':rrule'] = $first->GetPValue('RRULE');
// Skip it if it's after our start date for this import.
if ( $dtstart < $after && empty($calitem_params[':rrule']) ) continue;
$dtend = $first->GetPValue('DTEND');
if ( isset($dtend) && $dtend != '' ) {
dbg_error_log( 'PUT', ' DTEND: "%s", DTSTART: "%s", DURATION: "%s"', $dtend, $dtstart, $first->GetPValue('DURATION') );
@ -1006,7 +1025,6 @@ EOSQL;
$calitem_params[':location'] = $first->GetPValue('LOCATION');
$calitem_params[':transp'] = $first->GetPValue('TRANSP');
$calitem_params[':description'] = $first->GetPValue('DESCRIPTION');
$calitem_params[':rrule'] = $first->GetPValue('RRULE');
$calitem_params[':url'] = $first->GetPValue('URL');
$calitem_params[':priority'] = $first->GetPValue('PRIORITY');
$calitem_params[':due'] = $first->GetPValue('DUE');