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

Don't expect the TZ to contain a leading slash.

Browse Source
This commit is contained in:
Andrew McMillan 2009-03-29 21:22:43 +13:00
parent 6098e364c0
commit d0af116a24
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,12 +336,12 @@ function import_collection( $ics_content, $user_no, $path, $caldav_context ) {
unset($tz); unset($tz);
unset($tz_locn); unset($tz_locn);
} }
dbg_error_log( "PUT", " Using TZID[%s] and location of [%s]", $tzid, (isset($tz_locn) ? $tz_locn : '') );
if ( ! isset($tz_locn) || ! preg_match( $tz_regex, $tz_locn ) ) { if ( ! isset($tz_locn) || ! preg_match( $tz_regex, $tz_locn ) ) {
if ( preg_match( '#/([^/]+/[^/]+)$#', $tzid, $matches ) ) { if ( preg_match( '#([^/]+/[^/]+)$#', $tzid, $matches ) ) {
$tz_locn = $matches[1]; $tz_locn = $matches[1];
} }
} }
dbg_error_log( "PUT", " Using TZID[%s] and location of [%s]", $tzid, (isset($tz_locn) ? $tz_locn : '') );
if ( isset($tz_locn) && ($tz_locn != $last_tz_locn) && preg_match( $tz_regex, $tz_locn ) ) { if ( isset($tz_locn) && ($tz_locn != $last_tz_locn) && preg_match( $tz_regex, $tz_locn ) ) {
dbg_error_log( "PUT", " Setting timezone to %s", $tz_locn ); dbg_error_log( "PUT", " Setting timezone to %s", $tz_locn );
$sql .= ( $tz_locn == '' ? '' : "SET TIMEZONE TO ".qpg($tz_locn).";" ); $sql .= ( $tz_locn == '' ? '' : "SET TIMEZONE TO ".qpg($tz_locn).";" );
@ -549,12 +549,12 @@ function putCalendarResource( &$request, $author, $caldav_context ) {
if ( $tz->GetPValue('TZID') == $tzid ) { if ( $tz->GetPValue('TZID') == $tzid ) {
// This is the one // This is the one
$tz_locn = $tz->GetPValue('X-LIC-LOCATION'); $tz_locn = $tz->GetPValue('X-LIC-LOCATION');
dbg_error_log( "PUT", " Using TZID[%s] and location of [%s]", $tzid, $tz_locn );
if ( ! isset($tz_locn) || ! preg_match( $tz_regex, $tz_locn ) ) { if ( ! isset($tz_locn) || ! preg_match( $tz_regex, $tz_locn ) ) {
if ( preg_match( '#/([^/]+/[^/]+)$#', $tzid, $matches ) ) { if ( preg_match( '#([^/]+/[^/]+)$#', $tzid, $matches ) ) {
$tz_locn = $matches[1]; $tz_locn = $matches[1];
} }
} }
dbg_error_log( "PUT", " Using TZID[%s] and location of [%s]", $tzid, $tz_locn );
if ( isset($tz_locn) && preg_match( $tz_regex, $tz_locn ) ) { if ( isset($tz_locn) && preg_match( $tz_regex, $tz_locn ) ) {
dbg_error_log( "PUT", " Setting timezone to %s", $tz_locn ); dbg_error_log( "PUT", " Setting timezone to %s", $tz_locn );
$sql = ( $tz_locn == '' ? '' : "SET TIMEZONE TO ".qpg($tz_locn).";" ); $sql = ( $tz_locn == '' ? '' : "SET TIMEZONE TO ".qpg($tz_locn).";" );