From f8eb19976b025ec49cb157158e3331b8cf08e836 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 18 May 2016 08:54:45 +0200
Subject: [PATCH] OO-2020: disable embedding openolat in a frame
---
.../org/olat/admin/security/SecurityAdminController.java | 2 ++
.../olat/admin/security/_i18n/LocalStrings_de.properties | 7 +------
.../olat/admin/security/_i18n/LocalStrings_en.properties | 1 +
.../java/org/olat/basesecurity/BaseSecurityModule.java | 4 ++--
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/admin/security/SecurityAdminController.java b/src/main/java/org/olat/admin/security/SecurityAdminController.java
index a812b68c4b3..8c44dd8b35e 100644
--- a/src/main/java/org/olat/admin/security/SecurityAdminController.java
+++ b/src/main/java/org/olat/admin/security/SecurityAdminController.java
@@ -65,6 +65,8 @@ public class SecurityAdminController extends FormBasicController {
topFrameEl = uifactory.addCheckboxesHorizontal("sec.topframe", "sec.topframe", formLayout, keys, values);
topFrameEl.select("on", securityModule.isForceTopFrame());
topFrameEl.addActionListener(FormEvent.ONCHANGE);
+ topFrameEl.setEnabled(false);
+ topFrameEl.setExampleKey("sec.top.frame.explanation", null);
// on: block wiki (more security); off: do not block wiki (less security)
wikiEl = uifactory.addCheckboxesHorizontal("sec.wiki", "sec.wiki", formLayout, keys, values);
diff --git a/src/main/java/org/olat/admin/security/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/admin/security/_i18n/LocalStrings_de.properties
index cb6ca82f617..06eb04048ec 100644
--- a/src/main/java/org/olat/admin/security/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/admin/security/_i18n/LocalStrings_de.properties
@@ -1,14 +1,9 @@
#Tue Jan 14 11:03:57 CET 2014
admin.menu.title=Sicherheit
admin.menu.title.alt=Sicherheitseinstellungen anpassen
-
-
-
-
-
-
sec.description=W\u00E4hlen Sie den notwendigen Sicherheitslevel je nach Anforderungen Ihrer Institution. Um die h\u00F6chste Sicherheitsstufe zu erreichen m\u00FCssen s\u00E4mtliche untenstehenden Sicherheitsfunktionen eingeschaltet sein.
sec.force.download=Dateidownload in Ordner erzwingen
sec.title=Sicherheitseinstellungen
sec.topframe=Frame Einbettung verhindern
sec.wiki=Wiki Ressourcen blockieren
+sec.top.frame.explanation=Einige Komponente von OpenOLAT (TinyMCE) sind nicht kompatibel mit OpenOLAT in einem Rahmen einzubetten.
diff --git a/src/main/java/org/olat/admin/security/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/security/_i18n/LocalStrings_en.properties
index 54acf026e34..acdc4f0ca2d 100644
--- a/src/main/java/org/olat/admin/security/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/security/_i18n/LocalStrings_en.properties
@@ -6,6 +6,7 @@ sec.description=Choose the security level depending on the requirements of your
sec.force.download=Force file download in folders
sec.topframe=Prevent embedding in frames
sec.wiki=Block wiki resources
+sec.top.frame.explanation=The rich text component (TinyMCE) is not compatible with embedding OpenOLAT in an frame.
diff --git a/src/main/java/org/olat/basesecurity/BaseSecurityModule.java b/src/main/java/org/olat/basesecurity/BaseSecurityModule.java
index ea91a4c62b3..f146dc6dc89 100644
--- a/src/main/java/org/olat/basesecurity/BaseSecurityModule.java
+++ b/src/main/java/org/olat/basesecurity/BaseSecurityModule.java
@@ -79,7 +79,7 @@ public class BaseSecurityModule extends AbstractOLATModule {
private static final String USERINFOS_TUNNEL_CBB = "userInfosTunnelCourseBuildingBlock";
-
+ /** The feature is enabled, always */
private static final String FORCE_TOP_FRAME = "forceTopFrame";
private static final String WIKI_ENABLED = "wiki";
@@ -498,7 +498,7 @@ public class BaseSecurityModule extends AbstractOLATModule {
}
public boolean isForceTopFrame() {
- return "enabled".equals(forceTopFrame);
+ return true;//"enabled".equals(forceTopFrame);
}
public void setForceTopFrame(boolean enable) {
--
GitLab