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

Fix a bug in addition of durations.

Browse Source
This commit is contained in:
Andrew McMillan 2007-11-24 23:06:36 +13:00
parent 114b4a1f26
commit 9a32c2c806
7 changed files with 158 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/RRule.php
View File

@ -282,23 +282,25 @@ class iCalDate {
function AddDuration( $duration ) {
list( $sign, $days, $time ) = preg_split( '/[PT]/', $duration );
$sign = ( $sign == "-" ? -1 : 1);
dbg_error_log( "RRule", " Adding duration to '%s' of sign: %d, days: %s, time: %s", $this->_text, $sign, $days, $time );
if ( preg_match( '/(\d)+(D|W)/', $days, $matches ) ) {
$days = intval($matches[1]);
if ( $matches[2] == 'W' ) $days *= 7;
$this->AddDays( $days * $sign );
}
if ( preg_match( '/(\d)+(H)/', $time, $matches ) ) $hh = $matches[1];
if ( preg_match( '/(\d)+(M)/', $time, $matches ) ) $mi = $matches[1];
if ( preg_match( '/(\d)+(S)/', $time, $matches ) ) $ss = $matches[1];
if ( preg_match( '/(\d+)(H)/', $time, $matches ) ) $hh = $matches[1];
if ( preg_match( '/(\d+)(M)/', $time, $matches ) ) $mi = $matches[1];
if ( preg_match( '/(\d+)(S)/', $time, $matches ) ) $ss = $matches[1];
dbg_error_log( "RRule", " Adding %02d:%02d:%02d * %d to %02d:%02d:%02d", $hh, $mi, $ss, $sign, $this->_hh, $this->_mi, $this->_ss );
$this->_hh += ($hh * $sign);
$this->_mi += ($mi * $sign);
$this->_ss += ($ss * $sign);
if ( $this->_ss < 0 ) { $this->_mi -= (intval(abs($this->ss/60))+1); $this->_ss += ((intval(abs($this->mi/60))+1) * 60); }
if ( $this->_ss > 59) { $this->_mi += (intval(abs($this->ss/60))+1); $this->_ss -= ((intval(abs($this->mi/60))+1) * 60); }
if ( $this->_mi < 0 ) { $this->_hh -= (intval(abs($this->mi/60))+1); $this->_mi += ((intval(abs($this->mi/60))+1) * 60); }
if ( $this->_mi > 59) { $this->_hh += (intval(abs($this->mi/60))+1); $this->_mi -= ((intval(abs($this->mi/60))+1) * 60); }
if ( $this->_ss < 0 ) { $this->_mi -= (intval(abs($this->_ss/60))+1); $this->_ss += ((intval(abs($this->_mi/60))+1) * 60); }
if ( $this->_ss > 59) { $this->_mi += (intval(abs($this->_ss/60))+1); $this->_ss -= ((intval(abs($this->_mi/60))+1) * 60); }
if ( $this->_mi < 0 ) { $this->_hh -= (intval(abs($this->_mi/60))+1); $this->_mi += ((intval(abs($this->_mi/60))+1) * 60); }
if ( $this->_mi > 59) { $this->_hh += (intval(abs($this->_mi/60))+1); $this->_mi -= ((intval(abs($this->_mi/60))+1) * 60); }
if ( $this->_hh < 0 ) { $this->AddDays( -1 * (intval(abs($this->_hh/24))+1) ); $this->_hh += ((intval(abs($this->_hh/24))+1)*24); }
if ( $this->_hh > 23) { $this->AddDays( (intval(abs($this->_hh/24))+1) ); $this->_hh -= ((intval(abs($this->_hh/24))+1)*24); }

48
testing/tests/regression-suite/830-Spec-FREEBUSY-1.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
Content-Length: 928
Content-Length: 1166
Content-Type: text/calendar
BEGIN:VCALENDAR
@ -11,28 +11,28 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:20061004T140000Z
DTEND:20070105T220000Z
FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000/PT2H
FREEBUSY:20061031T210000/PT1H
FREEBUSY:20061102T210000/PT1H
FREEBUSY:20061109T210000/PT1H
FREEBUSY:20061116T210000/PT1H
FREEBUSY:20061123T210000/PT1H
FREEBUSY:20061130T210000/PT1H
FREEBUSY:20061207T210000/PT1H
FREEBUSY:20061214T210000/PT1H
FREEBUSY:20061221T210000/PT1H
FREEBUSY:20061228T210000/PT1H
FREEBUSY:20070104T210000/PT1H
FREEBUSY:20061101T233000/PT1H
FREEBUSY:20061102T183000/PT2H
FREEBUSY:20061202T183000/PT2H
FREEBUSY:20070102T183000/PT2H
FREEBUSY:20061103T030000/PT1H45M
FREEBUSY:20061117T030000/PT1H45M
FREEBUSY:20061201T030000/PT1H45M
FREEBUSY:20061215T030000/PT1H45M
FREEBUSY:20061229T030000/PT1H45M
FREEBUSY:20061223T000000/PT2H
FREEBUSY:20061223T030000/PT2H
FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000/20061223T080000
FREEBUSY:20061031T210000/20061031T220000
FREEBUSY:20061102T210000/20061102T220000
FREEBUSY:20061109T210000/20061109T220000
FREEBUSY:20061116T210000/20061116T220000
FREEBUSY:20061123T210000/20061123T220000
FREEBUSY:20061130T210000/20061130T220000
FREEBUSY:20061207T210000/20061207T220000
FREEBUSY:20061214T210000/20061214T220000
FREEBUSY:20061221T210000/20061221T220000
FREEBUSY:20061228T210000/20061228T220000
FREEBUSY:20070104T210000/20070104T220000
FREEBUSY:20061101T233000/20061102T003000
FREEBUSY:20061102T183000/20061102T203000
FREEBUSY:20061202T183000/20061202T203000
FREEBUSY:20070102T183000/20070102T203000
FREEBUSY:20061103T030000/20061103T044500
FREEBUSY:20061117T030000/20061117T044500
FREEBUSY:20061201T030000/20061201T044500
FREEBUSY:20061215T030000/20061215T044500
FREEBUSY:20061229T030000/20061229T044500
FREEBUSY:20061223T000000/20061223T020000
FREEBUSY:20061223T030000/20061223T050000
END:VFREEBUSY
END:VCALENDAR

34
testing/tests/regression-suite/832-freebusy.result
View File

@ -46,23 +46,23 @@ FREEBUSY:20070302T183000/20070302T203000
FREEBUSY:20070402T183000/20070402T203000
FREEBUSY:20070502T183000/20070502T203000
FREEBUSY:20070602T183000/20070602T203000
FREEBUSY:20061117T030000/20061117T040500
FREEBUSY:20061201T030000/20061201T040500
FREEBUSY:20061215T030000/20061215T040500
FREEBUSY:20061229T030000/20061229T040500
FREEBUSY:20070112T030000/20070112T040500
FREEBUSY:20070126T030000/20070126T040500
FREEBUSY:20070209T030000/20070209T040500
FREEBUSY:20070223T030000/20070223T040500
FREEBUSY:20070309T030000/20070309T040500
FREEBUSY:20070323T030000/20070323T040500
FREEBUSY:20070406T030000/20070406T040500
FREEBUSY:20070420T030000/20070420T040500
FREEBUSY:20070504T030000/20070504T040500
FREEBUSY:20070518T030000/20070518T040500
FREEBUSY:20070601T030000/20070601T040500
FREEBUSY:20070615T030000/20070615T040500
FREEBUSY:20070629T030000/20070629T040500
FREEBUSY:20061117T030000/20061117T044500
FREEBUSY:20061201T030000/20061201T044500
FREEBUSY:20061215T030000/20061215T044500
FREEBUSY:20061229T030000/20061229T044500
FREEBUSY:20070112T030000/20070112T044500
FREEBUSY:20070126T030000/20070126T044500
FREEBUSY:20070209T030000/20070209T044500
FREEBUSY:20070223T030000/20070223T044500
FREEBUSY:20070309T030000/20070309T044500
FREEBUSY:20070323T030000/20070323T044500
FREEBUSY:20070406T030000/20070406T044500
FREEBUSY:20070420T030000/20070420T044500
FREEBUSY:20070504T030000/20070504T044500
FREEBUSY:20070518T030000/20070518T044500
FREEBUSY:20070601T030000/20070601T044500
FREEBUSY:20070615T030000/20070615T044500
FREEBUSY:20070629T030000/20070629T044500
FREEBUSY:20061223T000000/20061223T020000
FREEBUSY:20061223T030000/20061223T050000
END:VFREEBUSY

34
testing/tests/regression-suite/833-freebusy.result
View File

@ -46,23 +46,23 @@ FREEBUSY:20070302T183000/20070302T203000
FREEBUSY:20070402T183000/20070402T203000
FREEBUSY:20070502T183000/20070502T203000
FREEBUSY:20070602T183000/20070602T203000
FREEBUSY:20061117T030000/20061117T040500
FREEBUSY:20061201T030000/20061201T040500
FREEBUSY:20061215T030000/20061215T040500
FREEBUSY:20061229T030000/20061229T040500
FREEBUSY:20070112T030000/20070112T040500
FREEBUSY:20070126T030000/20070126T040500
FREEBUSY:20070209T030000/20070209T040500
FREEBUSY:20070223T030000/20070223T040500
FREEBUSY:20070309T030000/20070309T040500
FREEBUSY:20070323T030000/20070323T040500
FREEBUSY:20070406T030000/20070406T040500
FREEBUSY:20070420T030000/20070420T040500
FREEBUSY:20070504T030000/20070504T040500
FREEBUSY:20070518T030000/20070518T040500
FREEBUSY:20070601T030000/20070601T040500
FREEBUSY:20070615T030000/20070615T040500
FREEBUSY:20070629T030000/20070629T040500
FREEBUSY:20061117T030000/20061117T044500
FREEBUSY:20061201T030000/20061201T044500
FREEBUSY:20061215T030000/20061215T044500
FREEBUSY:20061229T030000/20061229T044500
FREEBUSY:20070112T030000/20070112T044500
FREEBUSY:20070126T030000/20070126T044500
FREEBUSY:20070209T030000/20070209T044500
FREEBUSY:20070223T030000/20070223T044500
FREEBUSY:20070309T030000/20070309T044500
FREEBUSY:20070323T030000/20070323T044500
FREEBUSY:20070406T030000/20070406T044500
FREEBUSY:20070420T030000/20070420T044500
FREEBUSY:20070504T030000/20070504T044500
FREEBUSY:20070518T030000/20070518T044500
FREEBUSY:20070601T030000/20070601T044500
FREEBUSY:20070615T030000/20070615T044500
FREEBUSY:20070629T030000/20070629T044500
FREEBUSY:20061223T000000/20061223T020000
FREEBUSY:20061223T030000/20061223T050000
END:VFREEBUSY

114
testing/tests/regression-suite/834-Spec-FREEBUSY-1.result
View File

@ -1,7 +1,7 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
Content-Length: 1957
Content-Length: 2519
Content-Type: text/calendar
BEGIN:VCALENDAR
@ -11,61 +11,61 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:20061001T000000Z
DTEND:20070630T235959Z
FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000/PT2H
FREEBUSY:20061031T210000/PT1H
FREEBUSY:20061102T210000/PT1H
FREEBUSY:20061109T210000/PT1H
FREEBUSY:20061116T210000/PT1H
FREEBUSY:20061123T210000/PT1H
FREEBUSY:20061130T210000/PT1H
FREEBUSY:20061207T210000/PT1H
FREEBUSY:20061214T210000/PT1H
FREEBUSY:20061221T210000/PT1H
FREEBUSY:20061228T210000/PT1H
FREEBUSY:20070104T210000/PT1H
FREEBUSY:20070111T210000/PT1H
FREEBUSY:20070118T210000/PT1H
FREEBUSY:20070125T210000/PT1H
FREEBUSY:20070201T210000/PT1H
FREEBUSY:20070208T210000/PT1H
FREEBUSY:20070215T210000/PT1H
FREEBUSY:20070222T210000/PT1H
FREEBUSY:20070301T210000/PT1H
FREEBUSY:20070308T210000/PT1H
FREEBUSY:20070315T210000/PT1H
FREEBUSY:20070322T210000/PT1H
FREEBUSY:20070329T210000/PT1H
FREEBUSY:20070405T210000/PT1H
FREEBUSY:20070412T210000/PT1H
FREEBUSY:20070419T210000/PT1H
FREEBUSY:20070426T210000/PT1H
FREEBUSY:20061101T233000/PT1H
FREEBUSY:20061102T183000/PT2H
FREEBUSY:20061202T183000/PT2H
FREEBUSY:20070102T183000/PT2H
FREEBUSY:20070202T183000/PT2H
FREEBUSY:20070302T183000/PT2H
FREEBUSY:20070402T183000/PT2H
FREEBUSY:20070502T183000/PT2H
FREEBUSY:20070602T183000/PT2H
FREEBUSY:20061103T030000/PT1H45M
FREEBUSY:20061117T030000/PT1H45M
FREEBUSY:20061201T030000/PT1H45M
FREEBUSY:20061215T030000/PT1H45M
FREEBUSY:20061229T030000/PT1H45M
FREEBUSY:20070112T030000/PT1H45M
FREEBUSY:20070126T030000/PT1H45M
FREEBUSY:20070209T030000/PT1H45M
FREEBUSY:20070223T030000/PT1H45M
FREEBUSY:20070309T030000/PT1H45M
FREEBUSY:20070323T030000/PT1H45M
FREEBUSY:20070406T030000/PT1H45M
FREEBUSY:20070420T030000/PT1H45M
FREEBUSY:20070504T030000/PT1H45M
FREEBUSY:20070518T030000/PT1H45M
FREEBUSY:20070601T030000/PT1H45M
FREEBUSY:20070615T030000/PT1H45M
FREEBUSY:20070629T030000/PT1H45M
FREEBUSY:20061223T030000/PT2H
FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000/20061223T080000
FREEBUSY:20061031T210000/20061031T220000
FREEBUSY:20061102T210000/20061102T220000
FREEBUSY:20061109T210000/20061109T220000
FREEBUSY:20061116T210000/20061116T220000
FREEBUSY:20061123T210000/20061123T220000
FREEBUSY:20061130T210000/20061130T220000
FREEBUSY:20061207T210000/20061207T220000
FREEBUSY:20061214T210000/20061214T220000
FREEBUSY:20061221T210000/20061221T220000
FREEBUSY:20061228T210000/20061228T220000
FREEBUSY:20070104T210000/20070104T220000
FREEBUSY:20070111T210000/20070111T220000
FREEBUSY:20070118T210000/20070118T220000
FREEBUSY:20070125T210000/20070125T220000
FREEBUSY:20070201T210000/20070201T220000
FREEBUSY:20070208T210000/20070208T220000
FREEBUSY:20070215T210000/20070215T220000
FREEBUSY:20070222T210000/20070222T220000
FREEBUSY:20070301T210000/20070301T220000
FREEBUSY:20070308T210000/20070308T220000
FREEBUSY:20070315T210000/20070315T220000
FREEBUSY:20070322T210000/20070322T220000
FREEBUSY:20070329T210000/20070329T220000
FREEBUSY:20070405T210000/20070405T220000
FREEBUSY:20070412T210000/20070412T220000
FREEBUSY:20070419T210000/20070419T220000
FREEBUSY:20070426T210000/20070426T220000
FREEBUSY:20061101T233000/20061102T003000
FREEBUSY:20061102T183000/20061102T203000
FREEBUSY:20061202T183000/20061202T203000
FREEBUSY:20070102T183000/20070102T203000
FREEBUSY:20070202T183000/20070202T203000
FREEBUSY:20070302T183000/20070302T203000
FREEBUSY:20070402T183000/20070402T203000
FREEBUSY:20070502T183000/20070502T203000
FREEBUSY:20070602T183000/20070602T203000
FREEBUSY:20061103T030000/20061103T044500
FREEBUSY:20061117T030000/20061117T044500
FREEBUSY:20061201T030000/20061201T044500
FREEBUSY:20061215T030000/20061215T044500
FREEBUSY:20061229T030000/20061229T044500
FREEBUSY:20070112T030000/20070112T044500
FREEBUSY:20070126T030000/20070126T044500
FREEBUSY:20070209T030000/20070209T044500
FREEBUSY:20070223T030000/20070223T044500
FREEBUSY:20070309T030000/20070309T044500
FREEBUSY:20070323T030000/20070323T044500
FREEBUSY:20070406T030000/20070406T044500
FREEBUSY:20070420T030000/20070420T044500
FREEBUSY:20070504T030000/20070504T044500
FREEBUSY:20070518T030000/20070518T044500
FREEBUSY:20070601T030000/20070601T044500
FREEBUSY:20070615T030000/20070615T044500
FREEBUSY:20070629T030000/20070629T044500
FREEBUSY:20061223T030000/20061223T050000
END:VFREEBUSY
END:VCALENDAR

34
testing/tests/regression-suite/835-freebusy.result
View File

@ -46,23 +46,23 @@ FREEBUSY:20070302T183000/20070302T203000
FREEBUSY:20070402T183000/20070402T203000
FREEBUSY:20070502T183000/20070502T203000
FREEBUSY:20070602T183000/20070602T203000
FREEBUSY:20061117T030000/20061117T040500
FREEBUSY:20061201T030000/20061201T040500
FREEBUSY:20061215T030000/20061215T040500
FREEBUSY:20061229T030000/20061229T040500
FREEBUSY:20070112T030000/20070112T040500
FREEBUSY:20070126T030000/20070126T040500
FREEBUSY:20070209T030000/20070209T040500
FREEBUSY:20070223T030000/20070223T040500
FREEBUSY:20070309T030000/20070309T040500
FREEBUSY:20070323T030000/20070323T040500
FREEBUSY:20070406T030000/20070406T040500
FREEBUSY:20070420T030000/20070420T040500
FREEBUSY:20070504T030000/20070504T040500
FREEBUSY:20070518T030000/20070518T040500
FREEBUSY:20070601T030000/20070601T040500
FREEBUSY:20070615T030000/20070615T040500
FREEBUSY:20070629T030000/20070629T040500
FREEBUSY:20061117T030000/20061117T044500
FREEBUSY:20061201T030000/20061201T044500
FREEBUSY:20061215T030000/20061215T044500
FREEBUSY:20061229T030000/20061229T044500
FREEBUSY:20070112T030000/20070112T044500
FREEBUSY:20070126T030000/20070126T044500
FREEBUSY:20070209T030000/20070209T044500
FREEBUSY:20070223T030000/20070223T044500
FREEBUSY:20070309T030000/20070309T044500
FREEBUSY:20070323T030000/20070323T044500
FREEBUSY:20070406T030000/20070406T044500
FREEBUSY:20070420T030000/20070420T044500
FREEBUSY:20070504T030000/20070504T044500
FREEBUSY:20070518T030000/20070518T044500
FREEBUSY:20070601T030000/20070601T044500
FREEBUSY:20070615T030000/20070615T044500
FREEBUSY:20070629T030000/20070629T044500
FREEBUSY:20061223T030000/20061223T050000
END:VFREEBUSY
END:VCALENDAR

34
testing/tests/regression-suite/836-freebusy.result
View File

@ -46,23 +46,23 @@ FREEBUSY:20070302T183000/20070302T203000
FREEBUSY:20070402T183000/20070402T203000
FREEBUSY:20070502T183000/20070502T203000
FREEBUSY:20070602T183000/20070602T203000
FREEBUSY:20061117T030000/20061117T040500
FREEBUSY:20061201T030000/20061201T040500
FREEBUSY:20061215T030000/20061215T040500
FREEBUSY:20061229T030000/20061229T040500
FREEBUSY:20070112T030000/20070112T040500
FREEBUSY:20070126T030000/20070126T040500
FREEBUSY:20070209T030000/20070209T040500
FREEBUSY:20070223T030000/20070223T040500
FREEBUSY:20070309T030000/20070309T040500
FREEBUSY:20070323T030000/20070323T040500
FREEBUSY:20070406T030000/20070406T040500
FREEBUSY:20070420T030000/20070420T040500
FREEBUSY:20070504T030000/20070504T040500
FREEBUSY:20070518T030000/20070518T040500
FREEBUSY:20070601T030000/20070601T040500
FREEBUSY:20070615T030000/20070615T040500
FREEBUSY:20070629T030000/20070629T040500
FREEBUSY:20061117T030000/20061117T044500
FREEBUSY:20061201T030000/20061201T044500
FREEBUSY:20061215T030000/20061215T044500
FREEBUSY:20061229T030000/20061229T044500
FREEBUSY:20070112T030000/20070112T044500
FREEBUSY:20070126T030000/20070126T044500
FREEBUSY:20070209T030000/20070209T044500
FREEBUSY:20070223T030000/20070223T044500
FREEBUSY:20070309T030000/20070309T044500
FREEBUSY:20070323T030000/20070323T044500
FREEBUSY:20070406T030000/20070406T044500
FREEBUSY:20070420T030000/20070420T044500
FREEBUSY:20070504T030000/20070504T044500
FREEBUSY:20070518T030000/20070518T044500
FREEBUSY:20070601T030000/20070601T044500
FREEBUSY:20070615T030000/20070615T044500
FREEBUSY:20070629T030000/20070629T044500
FREEBUSY:20061223T030000/20061223T050000
END:VFREEBUSY
END:VCALENDAR