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

Parse out those silly timezone names better.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-25 18:48:29 -07:00
parent 061944f2c7
commit 1e3dbd208d
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
inc/RRule-v2.php
View File

@ -46,8 +46,10 @@ class RepeatRuleDateTime extends DateTime {
$tzid = 'UTC'; $tzid = 'UTC';
} }
else if ( isset($matches[1]) && $matches[1] != '' ) { else if ( isset($matches[1]) && $matches[1] != '' ) {
$dtz = new DateTimeZone($matches[1]); try {
if ( !isset($dtz) ) { $dtz = new DateTimeZone($matches[1]);
}
catch (Exception $e) {
/** @TODO: need to try and parse a timezone from all the crap we could receive */ /** @TODO: need to try and parse a timezone from all the crap we could receive */
dbg_error_log( 'ERROR', 'Could not create timezone for "%s"', $matches[1] ); dbg_error_log( 'ERROR', 'Could not create timezone for "%s"', $matches[1] );
} }
@ -57,7 +59,25 @@ class RepeatRuleDateTime extends DateTime {
} }
} }
if ( is_string($dtz) ) { if ( is_string($dtz) ) {
$dtz = new DateTimeZone($dtz); try {
$dtz = new DateTimeZone($dtz);
}
catch (Exception $e) {
$original = $dtz;
if ( preg_match( '{((([^/]+)/)?[^/]+)$}', $dtz, $matches ) ) {
$dtz = $matches[1];
$tzid = $dtz;
dbg_error_log( 'RRule', 'Found timezone "%s", will process as "%s"', $original, $dtz );
}
try {
$dtz = new DateTimeZone($dtz);
}
catch (Exception $e) {
dbg_error_log( 'ERROR', 'Could not parse timezone "%s" - will use floating time', $original );
$dtz = new DateTimeZone('UTC');
$tzid = null;
}
}
} }
if($dtz === null) { if($dtz === null) {
if ( preg_match('/\d{8}T\d{6}Z/', $date) ) { if ( preg_match('/\d{8}T\d{6}Z/', $date) ) {