Horde iCalendar.php::parsevCalendar now accepts ';' AND ',' as field delimiter for EXDATE and FREEBUSY

This commit is contained in:
Christian Binder 2006-11-09 09:57:49 +00:00
parent 1de2cd5e23
commit 0f4fee5b3f

View File

@ -550,11 +550,11 @@ class Horde_iCalendar {
} }
break; break;
// Comma seperated dates. // Comma and semicolon seperated dates.
case 'EXDATE': case 'EXDATE':
$values = array(); $values = array();
$dates = array(); $dates = array();
preg_match_all('/;([^;]*)/', ';' . $value, $values); preg_match_all('/[,;]([^,;]*)/', ';' . $value, $values);
foreach ($values[1] as $value) { foreach ($values[1] as $value) {
if (isset($params['VALUE'])) { if (isset($params['VALUE'])) {
@ -579,7 +579,7 @@ class Horde_iCalendar {
case 'FREEBUSY': case 'FREEBUSY':
$values = array(); $values = array();
$periods = array(); $periods = array();
preg_match_all('/,([^,]*)/', ',' . $value, $values); preg_match_all('/[,;]([^,;]*)/', ';' . $value, $values);
foreach ($values[1] as $value) { foreach ($values[1] as $value) {
$periods[] = $this->_parsePeriod($value); $periods[] = $this->_parsePeriod($value);
} }