From 07ec44fc22a248edcfa716ecde54f4e534a93bb2 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 26 Feb 2020 14:18:19 +0100
Subject: [PATCH] OO-4537: ampersand are fobridden in Adobe Connect (patch S.
Clemenz)
---
.../adobeconnect/ui/EditAdobeConnectMeetingController.java | 3 +++
.../modules/adobeconnect/ui/_i18n/LocalStrings_de.properties | 1 +
.../modules/adobeconnect/ui/_i18n/LocalStrings_en.properties | 1 +
.../modules/adobeconnect/ui/_i18n/LocalStrings_fr.properties | 1 +
4 files changed, 6 insertions(+)
diff --git a/src/main/java/org/olat/modules/adobeconnect/ui/EditAdobeConnectMeetingController.java b/src/main/java/org/olat/modules/adobeconnect/ui/EditAdobeConnectMeetingController.java
index cc6168b4f03..9a77eb36818 100644
--- a/src/main/java/org/olat/modules/adobeconnect/ui/EditAdobeConnectMeetingController.java
+++ b/src/main/java/org/olat/modules/adobeconnect/ui/EditAdobeConnectMeetingController.java
@@ -178,6 +178,9 @@ public class EditAdobeConnectMeetingController extends FormBasicController {
if(!StringHelper.containsNonWhitespace(nameEl.getValue())) {
nameEl.setErrorKey("form.legende.mandatory", null);
allOk &= false;
+ } else if (nameEl.getValue().contains("&")) {
+ nameEl.setErrorKey("form.invalidchar.noamp", null);
+ allOk &= false;
}
startDateEl.clearError();
diff --git a/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_de.properties
index 0b6f002101b..f0db324c020 100644
--- a/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_de.properties
@@ -36,6 +36,7 @@ error.prefix=Ein Fehler ist aufgetreten\:
error.rangeError=Datumsbereich ist nicht g\u00FCltig.
error.start.after.end=Das Datum f\u00FCr das Ende des Meetings darf nicht vor dem Beginn Datum sein.
error.unkown=Unerwartete Fehler
+form.invalidchar.noamp=Das Und-Zeichen ist nicht erlaubt.
meeting.configure.button=In Raum gehen und konfigurieren
meeting.create.intro=Das Meeting wurde noch nicht er\u00f6ffnet. Teilnehmer k\u00F6nnen den Raum f\u00fcr ein geplantes Meeting ggf. nicht betreten.
meeting.create.button=Meeting er\u00f6ffnen
diff --git a/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_en.properties
index 8e1d6117b83..5112ae519df 100644
--- a/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_en.properties
@@ -36,6 +36,7 @@ error.prefix=An error happened\:
error.rangeError=The range is not valid.
error.start.after.end=The end date of the meeting must not be before the start date.
error.unkown=Unkown error
+form.invalidchar.noamp=The ampersand is not allowed.
meeting.configure.button=Go and configure the room
meeting.create.button=Open the meeting
meeting.create.intro=The meeting has not been opened, yet. Participants are not able to enter the classroom for a meeting.
diff --git a/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_fr.properties
index c93b933ff24..bb424e72e68 100644
--- a/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/adobeconnect/ui/_i18n/LocalStrings_fr.properties
@@ -87,3 +87,4 @@ adobeconnect.module.enabled.for.courses=Cours
meetings.past=Meetings anciens
content.open=Ouvrir
meeting.name=Nom
+form.invalidchar.noamp=L'esperluette n'est pas permis.
--
GitLab