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

Fix very buggy conversion of duration to seconds.

Browse Source 
Obviously this was never tested before.
This commit is contained in:
Andrew McMillan 2013-05-29 12:50:02 +12:00
parent 04ad1ac742
commit 56ee5a62fa
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
inc/RRule-v2.php
View File

@ -115,20 +115,24 @@ class Rfc5545Duration {
*/
function asSeconds() {
if ( !isset($this->epoch_seconds) ) {
if ( preg_match('{^(-?)P(\d+W)|((\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?)$}i', $this->as_text, $matches) ) {
if ( isset($matches[2]) ) $this->days = ($matches[2] * 7);
if ( preg_match('{^(-?)P(\d+W)|(?:(\d+)D?(?:T(\d+)H?(\d+)M?(\d+)S?)?)$}i', $this->as_text, $matches) ) {
// @printf("%s - %s - %s - %s - %s - %s\n", $matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[6]);
$this->secs = 0;
if ( !empty($matches[2]) ) {
$this->days = (intval($matches[2]) * 7);
}
else {
if ( isset($matches[4]) ) $this->days = $matches[4];
$this->secs = 0;
if ( isset($matches[6]) ) $this->secs += $matches[6] * 3600;
if ( isset($matches[7]) ) $this->days += $matches[7] * 60;
if ( isset($matches[8]) ) $this->days += $matches[8];
if ( !empty($matches[3]) ) $this->days = intval($matches[3]);
if ( !empty($matches[4]) ) $this->secs += intval($matches[4]) * 3600;
if ( !empty($matches[5]) ) $this->secs += intval($matches[5]) * 60;
if ( !empty($matches[6]) ) $this->secs += intval($matches[6]);
}
if ( $matches[1] == '-' ) {
$this->days *= -1;
$this->secs *= -1;
}
$this->epoch_seconds = ($this->days * 86400) + $this->secs;
// printf("Duration: %d days & %d seconds (%d epoch seconds)\n", $this->days, $this->secs, $this->epoch_seconds);
}
else {
throw new Exception('Invalid epoch: "'+$this->as_text+"'");