From bea4b0dcf9647577c12db3f0731f05c57e733df0 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Mon, 17 May 2021 09:33:42 +0200
Subject: [PATCH] Fix calendar title not being set for scheduled calls and the
 contacts as participants not being counted

---
 calendar/inc/class.calendar_boupdate.inc.php | 4 +++-
 calendar/js/app.js                           | 2 +-
 calendar/js/app.ts                           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 9544e8d516..805f3181e5 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1123,11 +1123,13 @@ class calendar_boupdate extends calendar_bo
 						true);
 
 					$details['videoconference'] = EGroupware\Status\Videoconference\Call::genMeetingUrl($event['##videoconference'], [
+						'title' => $event['title'],
 						'name' => $fullname,
 						'email' => is_numeric($userid) ? Api\Accounts::id2name($userid, 'account_email') : $userid,
 						'avatar' => (string)$avatar,
 						'account_id' => $userid,
-							'cal_id' => $details['id']
+						'cal_id' => $details['id'],
+						'notify_only' => true
 					], ['participants' =>array_filter($event['participants'], function($key){return is_numeric($key);}, ARRAY_FILTER_USE_KEY)], $startdate, $enddate);
 					$event_arr['videoconference'] = [
 						'field' => lang('Video Conference'),
diff --git a/calendar/js/app.js b/calendar/js/app.js
index 1674cd2598..2a10ec8778 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -3688,7 +3688,7 @@ var CalendarApp = /** @class */ (function (_super) {
             // Send just the timestamp (as a string) with no timezone
             (typeof _data.start != "string" ? _data.start.toJSON() : _data.start).slice(0, -1),
             (typeof _data.end != "string" ? _data.end.toJSON() : _data.end).slice(0, -1), {
-                participants: Object.keys(_data.participants).filter(function (v) { return v.match(/^[0-9]|[e]/); })
+                participants: Object.keys(_data.participants).filter(function (v) { return v.match(/^[0-9|e|c]/); })
             }], function (_value) {
             if (_value) {
                 if (_value.err)
diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index dbb7aa72c6..f34cded500 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -4577,7 +4577,7 @@ class CalendarApp extends EgwApp
 				( typeof _data.start != "string" ? _data.start.toJSON() : _data.start).slice(0,-1),
                 ( typeof _data.end != "string" ? _data.end.toJSON() : _data.end).slice(0,-1),
 				{
-					participants:Object.keys(_data.participants).filter(v => {return v.match(/^[0-9]|[e]/)})
+					participants:Object.keys(_data.participants).filter(v => {return v.match(/^[0-9|e|c]/)})
 				}], function(_value){
 					if (_value)
 					{