From b7bbcbd257072c67dd76d3b3b85015fa17fc586f Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 15 Aug 2013 14:35:11 +0200
Subject: [PATCH] OO-652: fix escaping issue in disclaimer controller
---
src/main/java/org/olat/registration/DisclaimerController.java | 2 +-
.../java/org/olat/registration/DisclaimerFormController.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/registration/DisclaimerController.java b/src/main/java/org/olat/registration/DisclaimerController.java
index 48a3acb170e..7166b940761 100644
--- a/src/main/java/org/olat/registration/DisclaimerController.java
+++ b/src/main/java/org/olat/registration/DisclaimerController.java
@@ -137,7 +137,7 @@ public class DisclaimerController extends BasicController {
@Override
protected void event(UserRequest ureq, Controller source, Event event) {
if (source == this.disclaimerFormController) {
- if (event == event.CANCELLED_EVENT) {
+ if (event == Event.CANCELLED_EVENT) {
fireEvent(ureq, Event.CANCELLED_EVENT);
} else if (event == Event.DONE_EVENT) {
// Verify that, if the additional checkbox is configured to be visible, it is checked as well
diff --git a/src/main/java/org/olat/registration/DisclaimerFormController.java b/src/main/java/org/olat/registration/DisclaimerFormController.java
index dcaa5fed3d6..c8e406a1429 100644
--- a/src/main/java/org/olat/registration/DisclaimerFormController.java
+++ b/src/main/java/org/olat/registration/DisclaimerFormController.java
@@ -82,6 +82,7 @@ public class DisclaimerFormController extends FormBasicController {
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
// Add the "accept" checkbox to the form.
acceptCheckbox = uifactory.addCheckboxesVertical(ACKNOWLEDGE_CHECKBOX_NAME, null, formLayout, new String[] {DCL_CHECKBOX_KEY}, new String[] {translate(NLS_DISCLAIMER_ACKNOWLEDGED)}, null, 1);
+ acceptCheckbox.setEscapeHtml(false);
acceptCheckbox.setMandatory(false);
acceptCheckbox.select(DCL_CHECKBOX_KEY, readOnly);
@@ -90,6 +91,7 @@ public class DisclaimerFormController extends FormBasicController {
String additionalCheckboxText = translate("disclaimer.additionalcheckbox");
if (additionalCheckboxText != null) {
additionalCheckbox = uifactory.addCheckboxesVertical(ADDITIONAL_CHECKBOX_NAME, null, formLayout, new String[] {DCL_CHECKBOX_KEY2}, new String[] {additionalCheckboxText}, null, 1);
+ additionalCheckbox.setEscapeHtml(false);
additionalCheckbox.select(DCL_CHECKBOX_KEY2, readOnly);
}
}
--
GitLab