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 complain if the event includes an unused timezone.

Browse Source
This commit is contained in:
Andrew McMillan 2010-04-26 23:27:15 +12:00
parent 8223e2e9f7
commit 8fbb5cf3a2
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,8 +140,6 @@ VALUES( :user_no, :parent_container, :dav_name, :dav_etag, :dav_displayname, TRU
*/ */
function public_events_only( $user_no, $dav_name ) { function public_events_only( $user_no, $dav_name ) {
global $c; global $c;
// Not supported until DB versions from 1.001.010
if ( $c->schema_version < 1001.010 ) return false;
$sql = 'SELECT public_events_only FROM collection WHERE dav_name = :dav_name'; $sql = 'SELECT public_events_only FROM collection WHERE dav_name = :dav_name';
@ -845,51 +843,53 @@ function write_resource( $user_no, $path, $caldav_data, $collection_id, $author,
/** Calculate what timezone to set, first, if possible */ /** Calculate what timezone to set, first, if possible */
$last_tz_locn = 'Turkmenikikamukau'; $last_tz_locn = 'Turkmenikikamukau'; // I really hope this location doesn't exist!
$tzid = $first->GetPParamValue('DTSTART','TZID'); $tzid = $first->GetPParamValue('DTSTART','TZID');
if ( !isset($tzid) || $tzid == '' ) $tzid = $first->GetPParamValue('DUE','TZID'); if ( !isset($tzid) || $tzid == '' ) $tzid = $first->GetPParamValue('DUE','TZID');
$timezones = $ic->GetComponents('VTIMEZONE'); if ( isset($tzid) && $tzid != '' ) {
foreach( $timezones AS $k => $tz ) { $timezones = $ic->GetComponents('VTIMEZONE');
if ( $tz->GetPValue('TZID') != $tzid ) { foreach( $timezones AS $k => $tz ) {
/** if ( $tz->GetPValue('TZID') != $tzid ) {
* We'll pretend they didn't forget to give us a TZID and that they /**
* really hope the server is running in the timezone they supplied... but be noisy about it. * We'll pretend they didn't forget to give us a TZID and that they
*/ * really hope the server is running in the timezone they supplied... but be noisy about it.
dbg_error_log( 'ERROR', ' Event includes TZID[%s] but users TZID[%s]!', $tz->GetPValue('TZID'), $tzid ); */
$tzid = $tz->GetPValue('TZID'); dbg_error_log( 'ERROR', ' Event includes TZID[%s] but uses TZID[%s]!', $tz->GetPValue('TZID'), $tzid );
} $tzid = $tz->GetPValue('TZID');
// This is the one }
$tz_locn = $tz->GetPValue('X-LIC-LOCATION'); // This is the one
if ( ! isset($tz_locn) ) { $tz_locn = $tz->GetPValue('X-LIC-LOCATION');
if ( preg_match( '#([^/]+/[^/]+)$#', $tzid, $matches ) ) if ( ! isset($tz_locn) ) {
$tz_locn = $matches[1]; if ( preg_match( '#([^/]+/[^/]+)$#', $tzid, $matches ) )
$tz_locn = $matches[1];
else {
dbg_error_log( 'ERROR', ' Couldn\'t guess Olsen TZ from TZID[%s]. This may end in tears...', $tzid );
}
}
else { else {
dbg_error_log( 'ERROR', ' Couldn\'t guess Olsen TZ from TZID[%s]. This may end in tears...', $tzid ); if ( ! preg_match( $tz_regex, $tz_locn ) ) {
if ( preg_match( '#([^/]+/[^/]+)$#', $tzid, $matches ) ) $tz_locn = $matches[1];
}
} }
}
else {
if ( ! preg_match( $tz_regex, $tz_locn ) ) {
if ( preg_match( '#([^/]+/[^/]+)$#', $tzid, $matches ) ) $tz_locn = $matches[1];
}
}
dbg_error_log( 'PUT', ' Using TZID[%s] and location of [%s]', $tzid, (isset($tz_locn) ? $tz_locn : '') ); 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 );
if ( $tz_locn != '' ) { if ( $tz_locn != '' ) {
$qry->QDo('SET TIMEZONE TO \''.$tz_locn."'" ); $qry->QDo('SET TIMEZONE TO \''.$tz_locn."'" );
}
$last_tz_locn = $tz_locn;
} }
$last_tz_locn = $tz_locn; $params = array( ':tzid' => $tzid);
} $qry = new AwlQuery('SELECT tz_locn FROM time_zone WHERE tz_id = :tzid', $params );
$params = array( ':tzid' => $tzid); if ( $qry->Exec('PUT',__LINE__,__FILE__) && $qry->rows() == 0 ) {
$qry = new AwlQuery('SELECT tz_locn FROM time_zone WHERE tz_id = :tzid', $params ); $params[':tzlocn'] = $tz_locn;
if ( $qry->Exec('PUT',__LINE__,__FILE__) && $qry->rows() == 0 ) { $params[':tzspec'] = (isset($tz) ? $tz->Render() : null );
$params[':tzlocn'] = $tz_locn; $qry->QDo('INSERT INTO time_zone (tz_id, tz_locn, tz_spec) VALUES(:tzid,:tzlocn,:tzspec)', $params );
$params[':tzspec'] = (isset($tz) ? $tz->Render() : null ); }
$qry->QDo('INSERT INTO time_zone (tz_id, tz_locn, tz_spec) VALUES(:tzid,:tzlocn,:tzspec)', $params ); if ( !isset($tz_locn) || $tz_locn == '' ) $tz_locn = $tzid;
}
if ( !isset($tz_locn) || $tz_locn == '' ) $tz_locn = $tzid;
}
} }
$created = $first->GetPValue('CREATED'); $created = $first->GetPValue('CREATED');