From 5e039970492187b3c268f0bde85e26d928243709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20B=C3=BCchel?= Date: Wed, 9 Jun 2021 19:37:21 +0200 Subject: [PATCH] SEBWIN-475: Cleaned and updated Zoom proctoring implementation. --- .../ProctoringController.cs | 4 +- SafeExamBrowser.Proctoring/Zoom/index.html | 118 ++++++++---------- .../Proctoring/ZoomSettings.cs | 2 +- 3 files changed, 53 insertions(+), 71 deletions(-) diff --git a/SafeExamBrowser.Proctoring/ProctoringController.cs b/SafeExamBrowser.Proctoring/ProctoringController.cs index 89979ba9..e2533dba 100644 --- a/SafeExamBrowser.Proctoring/ProctoringController.cs +++ b/SafeExamBrowser.Proctoring/ProctoringController.cs @@ -98,7 +98,7 @@ namespace SafeExamBrowser.Proctoring { start = !string.IsNullOrWhiteSpace(settings.Zoom.ApiKey); start &= !string.IsNullOrWhiteSpace(settings.Zoom.ApiSecret); - start &= settings.Zoom.MeetingNumber != default(int); + start &= !string.IsNullOrWhiteSpace(settings.Zoom.MeetingNumber); start &= !string.IsNullOrWhiteSpace(settings.Zoom.UserName); } @@ -236,7 +236,7 @@ namespace SafeExamBrowser.Proctoring { html = html.Replace("%%_API_KEY_%%", settings.Zoom.ApiKey); html = html.Replace("%%_API_SECRET_%%", settings.Zoom.ApiSecret); - html = html.Replace("123456789", Convert.ToString(settings.Zoom.MeetingNumber)); + html = html.Replace("%%_MEETING_NUMBER_%%", settings.Zoom.MeetingNumber); html = html.Replace("%%_USER_NAME_%%", settings.Zoom.UserName); } diff --git a/SafeExamBrowser.Proctoring/Zoom/index.html b/SafeExamBrowser.Proctoring/Zoom/index.html index a29ac0e8..9d01209b 100644 --- a/SafeExamBrowser.Proctoring/Zoom/index.html +++ b/SafeExamBrowser.Proctoring/Zoom/index.html @@ -1,36 +1,31 @@  - - + + - - - - - - - + + + + + + +