holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix vCal 1.0 RRULE issues again :-o

Browse Source
This commit is contained in:
Jörg Lehrke 2010-01-12 18:31:53 +00:00
parent c8b5f589b6
commit b358505359
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
calendar/inc/class.calendar_ical.inc.php
View File

@ -1748,12 +1748,16 @@ class calendar_ical extends calendar_boupdate
case 'W': case 'W':
case 'WEEKLY': case 'WEEKLY':
$days = array(); $days = array();
if (preg_match('/W(\d+) ([^ ]*)( ([^ ]*))?$/',$recurence, $recurenceMatches)) // 1.0 if (preg_match('/W(\d+)((?i: [AEFMORSTUW]*)+)?( +([^ ]*))$/',$recurence, $recurenceMatches)) // 1.0
{ {
$vcardData['recur_interval'] = $recurenceMatches[1]; $vcardData['recur_interval'] = $recurenceMatches[1];
if (empty($recurenceMatches[4])) if (empty($recurenceMatches[2]))
{ {
if ($recurenceMatches[2] != '#0') if (preg_match('/#(\d+)/',$recurenceMatches[4],$recurenceMatches))
{
if ($recurenceMatches[1]) $vcardData['recur_count'] = $recurenceMatches[1];
}
else
{ {
$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]); $vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
} }
@ -1763,7 +1767,11 @@ class calendar_ical extends calendar_boupdate
{ {
$days = explode(' ',trim($recurenceMatches[2])); $days = explode(' ',trim($recurenceMatches[2]));
if ($recurenceMatches[4] != '#0') if (preg_match('/#(\d+)/',$recurenceMatches[4],$recurenceMatches))
{
if ($recurenceMatches[1]) $vcardData['recur_count'] = $recurenceMatches[1];
}
else
{ {
$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[4]); $vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[4]);
} }
@ -1823,10 +1831,7 @@ class calendar_ical extends calendar_boupdate
elseif (preg_match('/D(\d+) (.*)/', $recurence, $recurenceMatches)) elseif (preg_match('/D(\d+) (.*)/', $recurence, $recurenceMatches))
{ {
$vcardData['recur_interval'] = $recurenceMatches[1]; $vcardData['recur_interval'] = $recurenceMatches[1];
if ($recurenceMatches[2] != '#0') $vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
{
$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
}
} }
else break; else break;
@ -1847,7 +1852,7 @@ class calendar_ical extends calendar_boupdate
break; break;
case 'M': case 'M':
if (preg_match('/MD(\d+) #(.\d)/', $recurence, $recurenceMatches)) if (preg_match('/MD(\d+)(?: [^ ])? #(\d+)/', $recurence, $recurenceMatches))
{ {
$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY; $vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
$vcardData['recur_interval'] = $recurenceMatches[1]; $vcardData['recur_interval'] = $recurenceMatches[1];
@ -1857,7 +1862,7 @@ class calendar_ical extends calendar_boupdate
date('H', $vcardData['end']), date('H', $vcardData['end']),
date('i', $vcardData['end']), date('i', $vcardData['end']),
date('s', $vcardData['end']), date('s', $vcardData['end']),
date('m', $vcardData['end']) + ($recurenceMatches[2] * $vcardData['recur_interval']), date('m', $vcardData['end']) + ($vcardData['recur_interval']*($recurenceMatches[2]-1)),
date('d', $vcardData['end']), date('d', $vcardData['end']),
date('Y', $vcardData['end']) date('Y', $vcardData['end'])
); );
@ -1870,19 +1875,26 @@ class calendar_ical extends calendar_boupdate
{ {
$vcardData['recur_interval'] = $recurenceMatches[1]; $vcardData['recur_interval'] = $recurenceMatches[1];
} }
if ($recurenceMatches[2] != '#0') $vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
{
$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
}
} }
elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches)) elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
{ {
$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY; $vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
if ($recurenceMatches[1] > 1) $vcardData['recur_interval'] = $recurenceMatches[1];
if (preg_match('/#(\d+)/',$recurenceMatches[4],$recurenceMatches))
{ {
$vcardData['recur_interval'] = $recurenceMatches[1]; if ($recurenceMatches[1])
{
$vcardData['recur_enddate'] = mktime(
date('H', $vcardData['end']),
date('i', $vcardData['end']),
date('s', $vcardData['end']),
date('m', $vcardData['start']) + ($vcardData['recur_interval']*($recurenceMatches[1]-1)),
date('d', $vcardData['start']),
date('Y', $vcardData['start']));
}
} }
if ($recurenceMatches[4] != '#0') else
{ {
$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[4]); $vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[4]);
} }