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

Try harder to get the right duration for an event.

Browse Source
This commit is contained in:
Andrew McMillan 2010-09-02 23:03:57 +12:00
parent 1cfec15233
commit c452f07e73
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
inc/RRule-v2.php
View File

@ -101,11 +101,7 @@ class RepeatRuleDateTime extends DateTime {
$this->tzid = null; $this->tzid = null;
} }
} }
elseif ( is_string($dtz) ) { elseif( $dtz === null || $dtz == '' ) {
$dtz = new RepeatRuleTimeZone($dtz);
$this->tzid = $dtz->tzid();
}
elseif( $dtz === null ) {
$dtz = new RepeatRuleTimeZone('UTC'); $dtz = new RepeatRuleTimeZone('UTC');
if ( preg_match('/(\d{8}(T\d{6})?)Z/', $date, $matches) ) { if ( preg_match('/(\d{8}(T\d{6})?)Z/', $date, $matches) ) {
if ( strlen($matches[1]) == 8 ) $this->is_date = true; if ( strlen($matches[1]) == 8 ) $this->is_date = true;
@ -115,6 +111,10 @@ class RepeatRuleDateTime extends DateTime {
$this->tzid = null; $this->tzid = null;
} }
} }
elseif ( is_string($dtz) ) {
$dtz = new RepeatRuleTimeZone($dtz);
$this->tzid = $dtz->tzid();
}
else { else {
$this->tzid = $dtz->getName(); $this->tzid = $dtz->getName();
} }
@ -145,6 +145,9 @@ class RepeatRuleDateTime extends DateTime {
if ( isset($matches[8]) && $matches[8] != '' ) $interval .= $minus . $matches[9] . ' minutes '; if ( isset($matches[8]) && $matches[8] != '' ) $interval .= $minus . $matches[9] . ' minutes ';
if (isset($matches[10]) &&$matches[10] != '' ) $interval .= $minus . $matches[11] . ' seconds '; if (isset($matches[10]) &&$matches[10] != '' ) $interval .= $minus . $matches[11] . ' seconds ';
} }
// printf( "Modify '%s' by: >>%s<<\n", $this->__toString(), $interval );
// print_r($this);
if ( !isset($interval) || $interval == '' ) $interval = '1 day';
parent::modify($interval); parent::modify($interval);
return $this->__toString(); return $this->__toString();
} }
@ -789,7 +792,7 @@ function expand_event_instances( $vResource, $range_start = null, $range_end = n
$end_type = ($comp->GetType() == 'VTODO' ? 'DUE' : 'DTEND'); $end_type = ($comp->GetType() == 'VTODO' ? 'DUE' : 'DTEND');
$duration = $comp->GetProperty('DURATION'); $duration = $comp->GetProperty('DURATION');
if ( !isset($duration) ) { if ( !isset($duration) || $duration->Value() == '' ) {
$instance_start = $comp->GetProperty('DTSTART'); $instance_start = $comp->GetProperty('DTSTART');
$dtsrt = new RepeatRuleDateTime( $instance_start->Value(), $instance_start->GetParameterValue('TZID')); $dtsrt = new RepeatRuleDateTime( $instance_start->Value(), $instance_start->GetParameterValue('TZID'));
$instance_end = $comp->GetProperty($end_type); $instance_end = $comp->GetProperty($end_type);