From 00a09eafa05b339b80664d308d6c11adb2fb114e Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 27 Nov 2020 12:20:44 +0100 Subject: [PATCH] WIP BBB: Fix ical notification contains wrong url --- calendar/inc/class.calendar_boupdate.inc.php | 2 +- calendar/inc/class.calendar_groupdav.inc.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index 7fd4097079..8b416c4114 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1116,7 +1116,7 @@ class calendar_boupdate extends calendar_bo switch($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format']) { case 'ical': - if (is_null($ics) || $m_type != $msg_type) // need different ical for organizer notification + if (is_null($ics) || $m_type != $msg_type || $event['##videoconference']) // need different ical for organizer notification or videoconference join urls { $calendar_ical = new calendar_ical(); $calendar_ical->setSupportedFields('full'); // full iCal fields+event TZ diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index 9d13c6a957..7ec4bd2eee 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -687,7 +687,8 @@ class calendar_groupdav extends Api\CalDAV\Handler 'name' => Api\Accounts::username($user), 'email' => Api\Accounts::id2name($user, 'account_email'), 'avatar' => (string)$avatar, - 'account_id' => $user + 'account_id' => $user, + 'cal_id' => $event['id'] ], [], $event['start_date'], $event['end_date']); $event['description'] = lang('Videoconference').":\n$link\n\n".$event['description']; }