extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: fix conflict check to take into account that whole-day (floating) events start and end by definition in all timezones at midnight

Browse Source 
and therefore must not conflict with other (non-floating) events starting or ending at midnight,
but can conflict in other timezones (were the event to check does NOT start or end at midnight)
This commit is contained in:
ralf 2024-08-06 08:54:12 +02:00
parent bfbf350cee
commit cdf2247047
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,6 +380,13 @@ class calendar_boupdate extends calendar_bo
$checked = 0; $checked = 0;
$start = microtime(true); $start = microtime(true);
$duration = Api\DateTime::to($event['end'], 'ts') - Api\DateTime::to($event['start'], 'ts'); $duration = Api\DateTime::to($event['end'], 'ts') - Api\DateTime::to($event['start'], 'ts');
// as floating, whole-day events are defined as whole-day in user timezone (in fact in every TZ!), but they are
// always stored in server-timezone, we have to account for the difference, to not miss conflicts!
$start_tz_diff = Api\DateTime::$server_timezone->getOffset(new Api\DateTime($event['start'])) -
Api\DateTime::$user_timezone->getOffset(new Api\DateTime($event['start']));
// might be different from $start_tz_diff, if TZ transition is during the event
$end_tz_diff = Api\DateTime::$server_timezone->getOffset(new Api\DateTime($event['end'])) -
Api\DateTime::$user_timezone->getOffset(new Api\DateTime($event['end']));
foreach($recurences as $date) foreach($recurences as $date)
{ {
$startts = $date->format('ts'); $startts = $date->format('ts');
@ -402,8 +409,8 @@ class calendar_boupdate extends calendar_bo
break; break;
} }
$overlapping_events =& $this->search(array( $overlapping_events =& $this->search(array(
'start' => $startts, 'start' => $startts-abs($start_tz_diff),
'end' => $startts+$duration, 'end' => $startts+$duration+abs($end_tz_diff),
'users' => $users, 'users' => $users,
'ignore_acl' => true, // otherwise we get only events readable by the user 'ignore_acl' => true, // otherwise we get only events readable by the user
'enum_groups' => true, // otherwise group-events would not block time 'enum_groups' => true, // otherwise group-events would not block time
@ -424,6 +431,11 @@ class calendar_boupdate extends calendar_bo
{ {
continue; continue;
} }
// check if event is really blocking, as whole-day events use floating time and might NOT block in user's timezone
if ($overlap['end'] <= $startts || $overlap['start'] >= $startts+$duration)
{
continue;
}
if ($this->debug > 3 || $this->debug == 'conflicts') if ($this->debug > 3 || $this->debug == 'conflicts')
{ {
$this->debug_message(__METHOD__.'() checking overlapping event %1',false,$overlap); $this->debug_message(__METHOD__.'() checking overlapping event %1',false,$overlap);