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

Fix timezone handling in RRULE expansion.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-27 11:45:51 +13:00
parent 1e3dbd208d
commit f59b0a84e8
6 changed files with 152 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
inc/RRule-v2.php
View File

@ -33,7 +33,52 @@ $rrule_day_numbers = array( 'SU' => 0, 'MO' => 1, 'TU' => 2, 'WE' => 3, 'TH' =>
$GLOBALS['debug_rrule'] = false;
// $GLOBALS['debug_rrule'] = true;
/**
* Wrap the DateTimeZone class to allow parsing some iCalendar TZID strangenesses
*/
class RepeatRuleTimeZone extends DateTimeZone {
private $tzid;
public function __construct($dtz = null) {
$this->tzid = false;
if ( !isset($dtz) ) return;
try {
parent::__construct($dtz);
$this->tzid = $dtz;
}
catch (Exception $e) {
$original = $dtz;
if ( preg_match( '{((([^/]+)/)?[^/]+)$}', $dtz, $matches ) ) {
$dtz = $matches[1];
dbg_error_log( 'RRule', 'Found timezone "%s", will process as "%s"', $original, $dtz );
}
try {
parent::__construct($dtz);
$this->tzid = $dtz;
}
catch (Exception $e) {
dbg_error_log( 'ERROR', 'Could not parse timezone "%s" - will use floating time', $original );
$dtz = new DateTimeZone('UTC');
$this->tzid = false;
}
}
}
function tzid() {
$tzid = parent::getName();
if ( $tzid != 'UTC' ) return $tzid;
return $this->tzid;
}
}
/**
* Wrap the DateTime class to make it friendlier to passing in random strings from iCalendar
* objects, and especially the random stuff used to identify timezones. We also add some
* utility methods and stuff too, in order to simplify some of the operations we need to do
* with dates.
*/
class RepeatRuleDateTime extends DateTime {
// public static $Format = 'Y-m-d H:i:s';
public static $Format = 'c';
@ -42,56 +87,33 @@ class RepeatRuleDateTime extends DateTime {
public function __construct($date = null, $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';
$dtz = new RepeatRuleTimeZone('UTC');
$this->tzid = 'UTC';
}
else if ( isset($matches[1]) && $matches[1] != '' ) {
try {
$dtz = new DateTimeZone($matches[1]);
}
catch (Exception $e) {
/** @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] );
}
$dtz = new RepeatRuleTimeZone($matches[1]);
$this->tzid = $dtz->tzid();
}
else {
$dtz = null;
$dtz = new RepeatRuleTimeZone('UTC');
$this->tzid = null;
}
}
if ( is_string($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;
}
}
elseif ( is_string($dtz) ) {
$dtz = new RepeatRuleTimeZone($dtz);
$this->tzid = $dtz->tzid();
}
if($dtz === null) {
elseif( $dtz === null ) {
$dtz = new RepeatRuleTimeZone('UTC');
if ( preg_match('/\d{8}T\d{6}Z/', $date) ) {
$dtz = new DateTimeZone('UTC');
$tzid = 'UTC';
$this->tzid = 'UTC';
}
else {
// $dtz = new DateTimeZone(date_default_timezone_get());
$dtz = new DateTimeZone('UTC');
$tzid = null;
$this->tzid = null;
}
}
else {
$tzid = $dtz->getName();
$this->tzid = $dtz->getName();
}
parent::__construct($date, $dtz);
@ -130,6 +152,10 @@ class RepeatRuleDateTime extends DateTime {
public function setTimeZone( $tz ) {
if ( is_string($tz) ) {
$tz = new RepeatRuleTimeZone($tz);
$this->tzid = $tz->tzid();
}
parent::setTimeZone( $tz );
return $this;
}

86
testing/tests/regression-suite/959-REPORT-public-expanded.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, calendar-access
ETag: "851a2f32439385c33cc2fe279045f088"
ETag: "d6a4c6b19dbb46bd1e3bf4fce8709319"
Content-Length: 13238
Content-Type: text/xml; charset="utf-8"
@ -23,7 +23,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081020T110000Z
DTSTART:20081021T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -34,7 +34,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081021T110000Z
DTSTART:20081022T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -45,7 +45,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081022T110000Z
DTSTART:20081023T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -56,7 +56,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081023T110000Z
DTSTART:20081024T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -67,7 +67,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081024T110000Z
DTSTART:20081025T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -78,7 +78,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081027T110000Z
DTSTART:20081028T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -89,7 +89,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081028T110000Z
DTSTART:20081029T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -100,7 +100,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081029T110000Z
DTSTART:20081030T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -111,7 +111,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081030T110000Z
DTSTART:20081031T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -122,7 +122,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081031T110000Z
DTSTART:20081101T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -133,7 +133,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081103T110000Z
DTSTART:20081104T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -144,7 +144,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081104T110000Z
DTSTART:20081105T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -155,7 +155,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081105T110000Z
DTSTART:20081106T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -166,7 +166,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081106T110000Z
DTSTART:20081107T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -177,7 +177,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081107T110000Z
DTSTART:20081108T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -188,7 +188,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081110T110000Z
DTSTART:20081111T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -199,7 +199,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081111T110000Z
DTSTART:20081112T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -210,7 +210,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081112T110000Z
DTSTART:20081113T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -221,7 +221,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081113T110000Z
DTSTART:20081114T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -232,7 +232,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081114T110000Z
DTSTART:20081115T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -243,7 +243,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081117T110000Z
DTSTART:20081118T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -254,7 +254,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081118T110000Z
DTSTART:20081119T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -265,7 +265,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081119T110000Z
DTSTART:20081120T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -276,7 +276,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081120T110000Z
DTSTART:20081121T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -287,7 +287,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081121T110000Z
DTSTART:20081122T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -298,7 +298,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081124T110000Z
DTSTART:20081125T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -309,7 +309,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081125T110000Z
DTSTART:20081126T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -320,7 +320,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081126T110000Z
DTSTART:20081127T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -331,7 +331,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081127T110000Z
DTSTART:20081128T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -342,7 +342,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081128T110000Z
DTSTART:20081129T000000Z
DURATION:PT30M
END:VEVENT
END:VCALENDAR
@ -367,7 +367,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
SUMMARY:Weekly Project Meeting
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081020T090000Z
DTSTART:20081020T220000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -378,7 +378,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
SUMMARY:Weekly Project Meeting
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081027T090000Z
DTSTART:20081027T220000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -389,7 +389,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
SUMMARY:Weekly Project Meeting
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081103T090000Z
DTSTART:20081103T220000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -400,7 +400,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
SUMMARY:Weekly Project Meeting
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081110T090000Z
DTSTART:20081110T220000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -411,7 +411,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
SUMMARY:Weekly Project Meeting
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081117T090000Z
DTSTART:20081117T220000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -422,7 +422,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
SUMMARY:Weekly Project Meeting
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081124T090000Z
DTSTART:20081124T220000Z
DURATION:PT60M
END:VEVENT
END:VCALENDAR
@ -447,7 +447,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
SUMMARY:Weekly catch-up
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081024T140000Z
DTSTART:20081025T030000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -458,7 +458,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
SUMMARY:Weekly catch-up
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081031T140000Z
DTSTART:20081101T030000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -469,7 +469,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
SUMMARY:Weekly catch-up
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081107T140000Z
DTSTART:20081108T030000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -480,7 +480,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
SUMMARY:Weekly catch-up
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081114T140000Z
DTSTART:20081115T030000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -491,7 +491,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
SUMMARY:Weekly catch-up
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081121T140000Z
DTSTART:20081122T030000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -502,7 +502,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
SUMMARY:Weekly catch-up
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081128T140000Z
DTSTART:20081129T030000Z
DURATION:PT60M
END:VEVENT
END:VCALENDAR

62
testing/tests/regression-suite/961-REPORT-public-expanded.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, calendar-access
ETag: "32d4e7813ebff6b3867b78ae2228ded6"
ETag: "857dcd8807d6eb47dcf05072458e4cce"
Content-Length: 9284
Content-Type: text/xml; charset="utf-8"
@ -23,7 +23,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081020T110000Z
DTSTART:20081021T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -34,7 +34,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081021T110000Z
DTSTART:20081022T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -45,7 +45,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081022T110000Z
DTSTART:20081023T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -56,7 +56,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081023T110000Z
DTSTART:20081024T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -67,7 +67,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081024T110000Z
DTSTART:20081025T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -78,7 +78,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081027T110000Z
DTSTART:20081028T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -89,7 +89,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081028T110000Z
DTSTART:20081029T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -100,7 +100,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081029T110000Z
DTSTART:20081030T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -111,7 +111,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081030T110000Z
DTSTART:20081031T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -122,7 +122,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081031T110000Z
DTSTART:20081101T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -133,7 +133,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081103T110000Z
DTSTART:20081104T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -144,7 +144,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081104T110000Z
DTSTART:20081105T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -155,7 +155,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081105T110000Z
DTSTART:20081106T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -166,7 +166,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081106T110000Z
DTSTART:20081107T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -177,7 +177,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081107T110000Z
DTSTART:20081108T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -188,7 +188,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081110T110000Z
DTSTART:20081111T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -199,7 +199,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081111T110000Z
DTSTART:20081112T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -210,7 +210,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081112T110000Z
DTSTART:20081113T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -221,7 +221,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081113T110000Z
DTSTART:20081114T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -232,7 +232,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081114T110000Z
DTSTART:20081115T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -243,7 +243,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081117T110000Z
DTSTART:20081118T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -254,7 +254,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081118T110000Z
DTSTART:20081119T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -265,7 +265,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081119T110000Z
DTSTART:20081120T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -276,7 +276,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081120T110000Z
DTSTART:20081121T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -287,7 +287,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081121T110000Z
DTSTART:20081122T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -298,7 +298,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081124T110000Z
DTSTART:20081125T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -309,7 +309,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081125T110000Z
DTSTART:20081126T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -320,7 +320,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081126T110000Z
DTSTART:20081127T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -331,7 +331,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081127T110000Z
DTSTART:20081128T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -342,7 +342,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081128T110000Z
DTSTART:20081129T000000Z
DURATION:PT30M
END:VEVENT
END:VCALENDAR

37
testing/tests/regression-suite/969-REPORT-bound.result
View File

@ -16,7 +16,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081020T110000Z
DTSTART:20081021T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -27,7 +27,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081021T110000Z
DTSTART:20081022T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -38,7 +38,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081022T110000Z
DTSTART:20081023T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -49,7 +49,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081023T110000Z
DTSTART:20081024T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -60,7 +60,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081024T110000Z
DTSTART:20081025T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -71,7 +71,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081027T110000Z
DTSTART:20081028T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -82,7 +82,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081028T110000Z
DTSTART:20081029T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -93,7 +93,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081029T110000Z
DTSTART:20081030T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -104,7 +104,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081030T110000Z
DTSTART:20081031T000000Z
DURATION:PT30M
END:VEVENT
BEGIN:VEVENT
@ -115,7 +115,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
SUMMARY:Daily Action Meeting
RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
X-MOZ-GENERATION:2
DTSTART:20081031T110000Z
DTSTART:20081101T000000Z
DURATION:PT30M
END:VEVENT
END:VCALENDAR
@ -140,7 +140,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
SUMMARY:Weekly Project Meeting
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081020T090000Z
DTSTART:20081020T220000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
@ -151,7 +151,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
SUMMARY:Weekly Project Meeting
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081027T090000Z
DTSTART:20081027T220000Z
DURATION:PT60M
END:VEVENT
END:VCALENDAR
@ -176,18 +176,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
SUMMARY:Weekly catch-up
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081024T140000Z
DURATION:PT60M
END:VEVENT
BEGIN:VEVENT
CREATED:20081023T055115Z
LAST-MODIFIED:20081023T055139Z
DTSTAMP:20081023T055115Z
UID:9429a973-2b13-4b1a-be09-948d75425c45
SUMMARY:Weekly catch-up
RRULE:FREQ=WEEKLY;INTERVAL=1
X-MOZ-GENERATION:2
DTSTART:20081031T140000Z
DTSTART:20081025T030000Z
DURATION:PT60M
END:VEVENT
END:VCALENDAR

2
testing/tests/regression-suite/991-MKTICKET-admin.result
View File

@ -35,7 +35,7 @@ Content-Type: text/xml; charset="utf-8"
privileges: >000000000001001000100001<
target_collection: >10<
target_resource_i: >NULL<
timeout: >00:59:21<
timeout: >01:00:00<
dav_owner_id: >4<
privileges: >000000000001001011100111<

2
testing/tests/regression-suite/991-MKTICKET-admin.test
View File

@ -19,7 +19,7 @@ ENDDATA
QUERY
SELECT dav_owner_id,
(expires - current_timestamp)::interval(0) AS timeout,
date_trunc( 'minute', ('55 seconds' + expires - current_timestamp)::interval(0)) AS timeout,
privileges,
target_collection_id,
target_resource_id