Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't import repeated instances of recurring events

Browse source
This commit is contained in:
Thomas Bruederli 2011-11-11 13:22:40 +01:00
parent 7aa1985905
commit 41edd38326
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/calendar/lib/calendar_ical.php
View file

@ -69,11 +69,14 @@ class calendar_ical
$parser = $this->get_parser(); $parser = $this->get_parser();
$parser->parsevCalendar($vcal, 'VCALENDAR', $charset); $parser->parsevCalendar($vcal, 'VCALENDAR', $charset);
$this->method = $parser->getAttributeDefault('METHOD', ''); $this->method = $parser->getAttributeDefault('METHOD', '');
$this->events = array(); $this->events = $seen = array();
if ($data = $parser->getComponents()) { if ($data = $parser->getComponents()) {
foreach ($data as $comp) { foreach ($data as $comp) {
if ($comp->getType() == 'vEvent') if ($comp->getType() == 'vEvent') {
$this->events[] = $this->_to_rcube_format($comp); $event = $this->_to_rcube_format($comp);
if (!$seen[$event['uid']]++)
$this->events[] = $event;
}
} }
} }
@ -88,7 +91,7 @@ class calendar_ical
*/ */
public function import_from_file($filepath) public function import_from_file($filepath)
{ {
$this->events = array(); $this->events = $seen = array();
$fp = fopen($filepath, 'r'); $fp = fopen($filepath, 'r');
// check file content first // check file content first
@ -111,8 +114,11 @@ class calendar_ical
if ($data = $parser->getComponents()) { if ($data = $parser->getComponents()) {
foreach ($data as $comp) { foreach ($data as $comp) {
if ($comp->getType() == 'vEvent') if ($comp->getType() == 'vEvent') {
$this->events[] = $this->_to_rcube_format($comp); $event = $this->_to_rcube_format($comp);
if (!$seen[$event['uid']]++)
$this->events[] = $event;
}
} }
} }