extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 21:51:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - fix alarm removed if user is only participant because of group invitation

Browse Source
This commit is contained in:
nathangray 2018-11-22 11:35:35 -07:00
parent 7d14918e49
commit 5e48cbe78c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1326,12 +1326,15 @@ class calendar_boupdate extends calendar_bo
// same with the alarms // same with the alarms
if (isset($event['alarm']) && is_array($event['alarm']) && isset($event['start'])) if (isset($event['alarm']) && is_array($event['alarm']) && isset($event['start']))
{ {
// Expand group invitations so we don't lose individual alarms
$expanded = $event;
$this->enum_groups($expanded);
foreach($event['alarm'] as $id => &$alarm) foreach($event['alarm'] as $id => &$alarm)
{ {
// remove alarms belonging to not longer existing or rejected participants // remove alarms belonging to not longer existing or rejected participants
if ($alarm['owner'] && isset($event['participants'])) if ($alarm['owner'] && isset($expanded['participants']))
{ {
$status = $event['participants'][$alarm['owner']]; $status = $expanded['participants'][$alarm['owner']];
if (!isset($status) || calendar_so::split_status($status) === 'R') if (!isset($status) || calendar_so::split_status($status) === 'R')
{ {
unset($event['alarm'][$id]); unset($event['alarm'][$id]);