extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP BBB: Fix ical notification contains wrong url

Browse Source
This commit is contained in:
Hadi Nategh 2020-11-27 12:20:44 +01:00
parent 24f7ed8401
commit 00a09eafa0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

3
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -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'];
}