zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-444 fixed

Browse source
This commit is contained in:
anhefti 2023-05-11 11:01:21 +02:00
parent 56120168b1
commit af17420be5
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ch/ethz/seb/sebserver/gui/content/exam/LmsSetupForm.java
View file

@ -15,6 +15,7 @@ import java.util.function.BooleanSupplier;
import java.util.function.Function; import java.util.function.Function;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
@ -481,7 +482,7 @@ public class LmsSetupForm implements TemplateComposer {
case TOKEN_REQUEST: { case TOKEN_REQUEST: {
throw new PageMessageException(new LocTextKey( throw new PageMessageException(new LocTextKey(
"sebserver.lmssetup.action.test.tokenRequestError", "sebserver.lmssetup.action.test.tokenRequestError",
Utils.formatHTMLLinesForceEscaped(Utils.escapeHTML_XML_EcmaScript(error.message)))); Utils.formatHTMLLinesForceEscaped(StringEscapeUtils.escapeHtml4(error.message))));
} }
case QUIZ_ACCESS_API_REQUEST: { case QUIZ_ACCESS_API_REQUEST: {
if (error.message.contains("quizaccess_sebserver_get_exams")) { if (error.message.contains("quizaccess_sebserver_get_exams")) {

10
src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java
View file

@ -11,7 +11,9 @@ package ch.ethz.seb.sebserver.gui.service.i18n.impl;
import java.util.Locale; import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.RWT;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
@ -269,8 +271,14 @@ public final class PolyglotPageServiceImpl implements PolyglotPageService {
final I18nSupport i18nSupport) { final I18nSupport i18nSupport) {
return label -> { return label -> {
if (locTextKey != null) { if (locTextKey != null) {
label.setText(i18nSupport.getText(locTextKey)); final String text = i18nSupport.getText(locTextKey);
if (BooleanUtils.toBoolean((Boolean) label.getData(RWT.MARKUP_ENABLED))) {
label.setText(StringEscapeUtils.escapeHtml4(text));
} else {
label.setText(text);
}
} }
if (i18nSupport.hasText(locToolTipKey)) { if (i18nSupport.hasText(locToolTipKey)) {
label.setToolTipText(Utils.formatLineBreaks(i18nSupport.getText(locToolTipKey))); label.setToolTipText(Utils.formatLineBreaks(i18nSupport.getText(locToolTipKey)));

4
src/main/java/ch/ethz/seb/sebserver/gui/widget/Message.java
View file

@ -10,6 +10,7 @@ package ch.ethz.seb.sebserver.gui.widget;
import java.util.Locale; import java.util.Locale;
import org.apache.commons.text.StringEscapeUtils;
import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.widgets.DialogCallback; import org.eclipse.rap.rwt.widgets.DialogCallback;
import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.graphics.Rectangle;
@ -17,7 +18,6 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport; import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport;
import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.CustomVariant; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.CustomVariant;
@ -46,7 +46,7 @@ public final class Message extends MessageBox {
super.prepareOpen(); super.prepareOpen();
} catch (final IllegalArgumentException e) { } catch (final IllegalArgumentException e) {
// fallback on markup text error // fallback on markup text error
super.setMessage(Utils.escapeHTML_XML_EcmaScript(super.getMessage())); super.setMessage(StringEscapeUtils.escapeHtml4(super.getMessage()));
super.prepareOpen(); super.prepareOpen();
} }
final GridLayout layout = (GridLayout) super.shell.getLayout(); final GridLayout layout = (GridLayout) super.shell.getLayout();