extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 23:19:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix one problem if all recurrences of an event with explicit recurrences were overwritten/exceptions

Browse Source
This commit is contained in:
ralf 2024-06-04 16:44:59 +02:00
parent 66f40ee391
commit be1224276b
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/DateTime.php
View File

@ -184,6 +184,11 @@ class DateTime extends \DateTime
} }
} }
public function __toString()
{
return (string)$this->format(self::DATABASE);
}
/** /**
* Like DateTime::add, but additional allow to use a string run through DateInterval::createFromDateString * Like DateTime::add, but additional allow to use a string run through DateInterval::createFromDateString
* *

7
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1417,8 +1417,11 @@ class calendar_boupdate extends calendar_bo
$occurrence = $rrule->current(); $occurrence = $rrule->current();
} }
while ($rrule->validDate($event['whole_day']) && ($enddate = $occurrence)); while ($rrule->validDate($event['whole_day']) && ($enddate = $occurrence));
$enddate->modify(($event['end'] - $event['start']).' second'); if ($enddate)
$event['recur_enddate'] = $save_event['recur_enddate'] = $enddate->format('ts'); {
$enddate->modify(($event['end'] - $event['start']).' second');
$event['recur_enddate'] = $enddate->format('ts');
}
//error_log(__METHOD__."($event[title]) start=".Api\DateTime::to($event['start'],'string').', end='.Api\DateTime::to($event['end'],'string').', range_end='.Api\DateTime::to($event['recur_enddate'],'string')); //error_log(__METHOD__."($event[title]) start=".Api\DateTime::to($event['start'],'string').', end='.Api\DateTime::to($event['end'],'string').', range_end='.Api\DateTime::to($event['recur_enddate'],'string'));
} }

7
calendar/inc/class.calendar_rrule.inc.php
View File

@ -597,9 +597,12 @@ class calendar_rrule implements Iterator
{ {
if ($this->type == self::PERIOD) if ($this->type == self::PERIOD)
{ {
reset($this->period); $this->current = clone reset($this->period);
}
else
{
$this->current = clone $this->time;
} }
$this->current = clone $this->time;
while ($this->valid() && while ($this->valid() &&
$this->exceptions && $this->exceptions &&
in_array($this->current->format('Ymd'),$this->exceptions)) in_array($this->current->format('Ymd'),$this->exceptions))