holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar: Fix event notifications had the wrong times in iCal attachment if user timezone was not server timezone

Browse Source
This commit is contained in:
nathangray 2021-01-14 14:19:45 -07:00
parent 72f7ac95b4
commit 09cefbb2e4
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,16 +247,8 @@ class calendar_boupdate extends calendar_bo
if ($event['videoconference'] && !empty($event['##videoconference']) && class_exists('EGroupware\\Status\\Videoconference\\Call') if ($event['videoconference'] && !empty($event['##videoconference']) && class_exists('EGroupware\\Status\\Videoconference\\Call')
&& !EGroupware\Status\Hooks::isVideoconferenceDisabled() && ($videoconferenceResId = \EGroupware\Status\Hooks::getVideoconferenceResourceId())) && !EGroupware\Status\Hooks::isVideoconferenceDisabled() && ($videoconferenceResId = \EGroupware\Status\Hooks::getVideoconferenceResourceId()))
{ {
$participant_total = 0;
foreach(['u','e','c'] as $p_type)
{
if(is_array($event['participant_types'][$p_type]))
{
$participant_total += count($event['participant_types'][$p_type]);
}
}
$event['participant_types']['r'][$videoconferenceResId] = $event['participant_types']['r'][$videoconferenceResId] =
$event['participants']['r'.$videoconferenceResId] = 'A'.$participant_total; $event['participants']['r'.$videoconferenceResId] = 'A'.(count($event['participant_types']['u']) + count($event['participant_types']['e']) + count($event['participant_types']['c']));
} }
// check for conflicts only happens !$ignore_conflicts AND if start + end date are given // check for conflicts only happens !$ignore_conflicts AND if start + end date are given
@ -1140,7 +1132,7 @@ class calendar_boupdate extends calendar_bo
$calendar_ical->setSupportedFields('full'); // full iCal fields+event TZ $calendar_ical->setSupportedFields('full'); // full iCal fields+event TZ
// we need to pass $event[id] so iCal class reads event again, // we need to pass $event[id] so iCal class reads event again,
// as event is in user TZ, but iCal class expects server TZ! // as event is in user TZ, but iCal class expects server TZ!
$ics = $calendar_ical->exportVCal([$cleared_event], $ics = $calendar_ical->exportVCal($cleared_event,
'2.0', $method, $cleared_event['recur_date'], '2.0', $method, $cleared_event['recur_date'],
'', 'utf-8', $method == 'REPLY' ? $user : 0 '', 'utf-8', $method == 'REPLY' ? $user : 0
); );