From 1af9a9b13f40b0673dc1c62d16785353cb388375 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 25 Feb 2021 10:33:34 -0700
Subject: [PATCH] Add videoconference link to event notification email

---
 calendar/inc/class.calendar_uiforms.inc.php | 4 ++++
 calendar/js/app.js                          | 2 +-
 calendar/js/app.ts                          | 2 +-
 calendar/templates/default/meeting.xet      | 8 ++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 81ee2f187d..2ff5f715b1 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -2196,6 +2196,10 @@ class calendar_uiforms extends calendar_ui
 						}
 				}
 				$event['id'] = $existing_event['id'];
+				if($existing_event['##videoconference'])
+				{
+					$event['##videoconference'] = $existing_event['##videoconference'];
+				}
 			}
 			else	// event not in calendar
 			{
diff --git a/calendar/js/app.js b/calendar/js/app.js
index a85caf6e55..c92a4c4f7a 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -3610,7 +3610,7 @@ var CalendarApp = /** @class */ (function (_super) {
                 if (_value.err)
                     egw.message(_value.err, 'error');
                 if (_value.url)
-                    app.status.openCall(_value.url);
+                    egw.top.app.status.openCall(_value.url);
             }
         }).sendRequest();
     };
diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index 362c51c6de..52c67bf88e 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -4478,7 +4478,7 @@ class CalendarApp extends EgwApp
 					if (_value)
 					{
 						if (_value.err) egw.message(_value.err, 'error');
-						if(_value.url) app.status.openCall(_value.url);
+						if(_value.url) egw.top.app.status.openCall(_value.url);
 					}
 			}).sendRequest();
 	}
diff --git a/calendar/templates/default/meeting.xet b/calendar/templates/default/meeting.xet
index 5d91852ec3..8d3bacb01b 100644
--- a/calendar/templates/default/meeting.xet
+++ b/calendar/templates/default/meeting.xet
@@ -57,11 +57,15 @@
 				</row>
 				<row class="row">
 					<description value="Location"/>
-					<description id="location" no_lang="1"/>
+					<hbox>
+						<description id="location" no_lang="1"/>
+						<description class="et2_link" value="Videoconference" disabled="!@##videoconference" onclick="app.calendar.joinVideoConference(widget.getArrayMgr('content').getEntry('##videoconference'), widget.getArrayMgr('content').data);"/>
+						<image src="videoconference" disabled="!@##videoconference"/>
+					</hbox>
 				</row>
 				<row class="row">
 					<description value="Date"/>
-					<hbox options="0,0">
+					<hbox>
 						<date-time id="start" readonly="true"/>
 						<date-time label="-" id="end" readonly="true" class="leftPad5"/>
 					</hbox>