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

Expanding functionality in RepeatRuleDateTime class.

Browse Source
This commit is contained in:
Andrew McMillan 2010-02-22 22:08:43 +13:00
parent 2e6dca26f2
commit d3a9d02b2e
1 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
inc/RRule-v2.php
View File

@ -33,13 +33,43 @@ $GLOBALS['debug_rrule'] = false;
class RepeatRuleDateTime extends DateTime { class RepeatRuleDateTime extends DateTime {
public static $Format = 'Y-m-d H:i:s'; // public static $Format = 'Y-m-d H:i:s';
public static $Format = 'c';
private $tzid;
public function __construct($date = null, DateTimeZone $dtz = null) { public function __construct($date = null, DateTimeZone $dtz = null) {
if (preg_match('/;?TZID=([^:]+):(\d{8}(T\d{6})?)(Z)?/', $date, $matches) ) {
if ( isset($matches[4]) && $matches[4] == 'Z' ) {
$dtz = new DateTimeZone('UTC');
$tzid = 'UTC';
}
else if ( isset($matches[1]) && $matches[1] != '' ) {
$dtz = new DateTimeZone($matches[1]);
}
else {
$dtz = null;
}
}
if ( is_string($dtz) ) {
$dtz = new DateTimeZone($dtz);
}
if($dtz === null) { if($dtz === null) {
$dtz = new DateTimeZone(date_default_timezone_get()); if ( preg_match('/\d{8}T\d{6}Z/', $date) ) {
$dtz = new DateTimeZone('UTC');
$tzid = 'UTC';
}
else {
// $dtz = new DateTimeZone(date_default_timezone_get());
$dtz = new DateTimeZone('UTC');
$tzid = null;
}
}
else {
$tzid = $dtz->getName();
} }
parent::__construct($date, $dtz); parent::__construct($date, $dtz);
return $this;
} }
@ -48,15 +78,30 @@ class RepeatRuleDateTime extends DateTime {
} }
public function AtGMT() { public function UTC() {
$gmt = parent::__clone(); $gmt = parent::__clone();
$dtz = parent::getTimezone(); if ( isset($this->tzid) && $this->tzid != 'UTC' ) {
$offset = $dtz->getOffset($gmt); $dtz = parent::getTimezone();
$gmt->modify( $offset . ' seconds' ); $offset = $dtz->getOffset($gmt);
$gmt->modify( $offset . ' seconds' );
}
return $gmt->format('Ymd\THis\Z'); return $gmt->format('Ymd\THis\Z');
} }
public function RFC5545() {
$result = '';
if ( isset($this->tzid) && $this->tzid != 'UTC' ) {
$result = ';TZID='.$this->tzid;
}
$result .= ':' . $gmt->format('Ymd\THis');
if ( isset($this->tzid) && $this->tzid == 'UTC' ) {
$result .= 'Z';
}
return $result;
}
public function setTimeZone( $tz ) { public function setTimeZone( $tz ) {
parent::setTimeZone( $tz ); parent::setTimeZone( $tz );
return $this; return $this;