mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 00:29:38 +01:00
Fix CalDav in Thunderbird no longer syncs when videoconference backend BigBlueButton is configured
This commit is contained in:
parent
904150728e
commit
644c602a88
@ -683,13 +683,22 @@ class calendar_groupdav extends Api\CalDAV\Handler
|
||||
$avatar = new Api\Contacts\Photo("account:$user",
|
||||
// disable sharing links currently, as sharing links from a different EGroupware user destroy the session
|
||||
true);
|
||||
$link = EGroupware\Status\Videoconference\Call::genMeetingUrl($event['##videoconference'], [
|
||||
|
||||
// wrap in try and catch in case videoconference throws exceptions. e.g. BBB server exceptions
|
||||
try {
|
||||
$link = EGroupware\Status\Videoconference\Call::genMeetingUrl($event['##videoconference'], [
|
||||
'name' => Api\Accounts::username($user),
|
||||
'email' => Api\Accounts::id2name($user, 'account_email'),
|
||||
'avatar' => (string)$avatar,
|
||||
'account_id' => $user,
|
||||
'cal_id' => $event['id']
|
||||
], [], $event['start_date'], $event['end_date']);
|
||||
], [], $event['start_date'], $event['end_date']);
|
||||
}catch (Exception $e)
|
||||
{
|
||||
//error_log(__METHOD__.'()'.$e->getMessage());
|
||||
// do nothing
|
||||
}
|
||||
|
||||
$event['description'] = lang('Videoconference').":\n$link\n\n".$event['description'];
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user