nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-09-20 06:09:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix parsing of incoming VCALENDAR to correctly preserve timezone info.

Browse Source
This commit is contained in:
Andrew McMillan 2008-01-25 22:09:03 +13:00
parent 6e0b4f8e92
commit 7472f88bc5
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,36 +141,41 @@ function import_collection( $ics_content, $user_no, $path, $caldav_context ) {
$state = ""; $state = "";
$tzid = 'unknown'; $tzid = 'unknown';
foreach( $lines AS $lno => $line ) { foreach( $lines AS $lno => $line ) {
dbg_error_log( "PUT", "CalendarLine[%04d] - %s: %s", $lno, $state, $line );
if ( $state == "" ) { if ( $state == "" ) {
if ( preg_match( '/^BEGIN:(VEVENT|VTIMEZONE|VTODO)$/', $line, $matches ) ) { if ( preg_match( '/^BEGIN:(VEVENT|VTIMEZONE|VTODO|VJOURNAL)$/', $line, $matches ) ) {
$current .= $line."\n"; $current .= $line."\n";
$state = $matches[1]; $state = $matches[1];
dbg_error_log( "PUT", "CalendarLine[%04d] - %s: %s", $lno, $state, $line );
} }
} }
else { else {
$current .= $line."\n"; $current .= $line."\n";
if ( $line == "END:$state" ) { if ( $line == "END:$state" ) {
switch ( $state ) { switch ( $state ) {
case 'VEVENT':
$events[] = array( 'data' => $current, 'tzid' => $tzid );
break;
case 'VTODO':
$events[] = array( 'data' => $current, 'tzid' => $tzid );
break;
case 'VTIMEZONE': case 'VTIMEZONE':
$timezones[$tzid] = $current; $timezones[$tzid] = $current;
dbg_error_log( "PUT", " Ended VTIMEZONE for TZID '%s' ", $tzid );
break;
case 'VEVENT':
case 'VTODO':
case 'VJOURNAL':
default:
$events[] = array( 'data' => $current, 'tzid' => $tzid );
dbg_error_log( "PUT", " Ended %s with TZID '%s' ", $state, $tzid );
break; break;
} }
$state = ""; $state = "";
$current = ""; $current = "";
$tzid = 'unknown'; $tzid = 'unknown';
} }
else if ( preg_match( '/TZID=([^:]+)(:|$)/', $line, $matches ) ) { else if ( preg_match( '/TZID[:=]([^:]+)(:|$)/', $line, $matches ) ) {
$tzid = $matches[1]; $tzid = $matches[1];
dbg_error_log( "PUT", " Found TZID of '%s' in '%s'", $tzid, $line );
} }
} }
} }
dbg_error_log( "PUT", " Finished input after $lno lines" );
$qry = new PgQuery("BEGIN; DELETE FROM calendar_item WHERE user_no=? AND dav_name ~ ?; DELETE FROM caldav_data WHERE user_no=? AND dav_name ~ ?;", $user_no, $path.'[^/]+$', $user_no, $path.'[^/]+$'); $qry = new PgQuery("BEGIN; DELETE FROM calendar_item WHERE user_no=? AND dav_name ~ ?; DELETE FROM caldav_data WHERE user_no=? AND dav_name ~ ?;", $user_no, $path.'[^/]+$', $user_no, $path.'[^/]+$');
if ( !$qry->Exec("PUT") ) rollback_on_error( $caldav_context, $user_no, $path ); if ( !$qry->Exec("PUT") ) rollback_on_error( $caldav_context, $user_no, $path );