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

Rewrite __construct() method of RepeatRuleDateTimeZone to be more robust.

Browse Source
This commit is contained in:
Andrew McMillan 2010-10-07 13:43:07 -04:00
parent 15880e9aaa
commit 04f17a65af
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
inc/RRule-v2.php
View File

@ -39,25 +39,27 @@ $GLOBALS['debug_rrule'] = false;
class RepeatRuleTimeZone extends DateTimeZone {
private $tz_defined;
public function __construct($dtz = null) {
public function __construct($in_dtz = null) {
$this->tz_defined = false;
if ( !isset($dtz) ) return;
if ( !isset($in_dtz) ) return;
$dtz = olson_from_tzstring($dtz);
try {
parent::__construct($dtz);
$this->tz_defined = $dtz;
}
catch (Exception $e) {
$original = $dtz;
if ( !isset($dtz) ) {
dbg_error_log( 'ERROR', 'Could not parse timezone "%s" - will use floating time', $original );
$dtz = new DateTimeZone('UTC');
$olson = olson_from_tzstring($in_dtz);
if ( isset($olson) ) {
try {
parent::__construct($olson);
$this->tz_defined = $olson;
}
catch (Exception $e) {
dbg_error_log( 'ERROR', 'Could not handle timezone "%s" (%s) - will use floating time', $in_dtz, $olson );
parent::__construct('UTC');
$this->tz_defined = false;
}
}
else {
dbg_error_log( 'ERROR', 'Could not recognize timezone "%s" - will use floating time', $in_dtz );
parent::__construct('UTC');
$this->tz_defined = false;
}
}
function tzid() {