Merge OpenOLAT 10.3 to OpenOLAT default branch with 5ecc3946a26868c286659c712b462f3f27b2df50

src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java

@@ -388,6 +388,10 @@ public class RichTextConfiguration implements Disposable {
 	public void disableMathEditor() {
 		tinyConfig = tinyConfig.disableMathEditor();
 	}
+	
+	public void disableImageAnMovie() {
+		tinyConfig = tinyConfig.disableImageAndMedia();
+	}
 
 	/**
 	 * Enable / disable the full-screen plugin
@@ -524,6 +528,15 @@ public class RichTextConfiguration implements Disposable {
 		linkBrowserBaseContainer = vfsContainer;
 		linkBrowserCustomTreeModel = customLinkTreeModel;
 	}
+	
+	public void disableFileBrowserCallback() {
+		linkBrowserImageSuffixes = null;
+		linkBrowserMediaSuffixes = null;
+		linkBrowserFlashPlayerSuffixes = null;
+		linkBrowserBaseContainer = null;
+		linkBrowserCustomTreeModel = null;
+		nonQuotedConfigValues.remove(FILE_BROWSER_CALLBACK);
+	}
 
 	/**
 	 * Set an optional path relative to the vfs container of the file browser

src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/TinyConfig.java

@@ -114,6 +114,16 @@ public class TinyConfig {
 				.enableFeature("olatmovieviewer");
 	}
 	
+	/**
+	 * Disable image, media and movie plugins.
+	 * @return
+	 */
+	public TinyConfig disableImageAndMedia() {
+		return disableFeature("image")
+				.disableFeature("media")
+				.disableFeature("olatmovieviewer");
+	}
+	
 	/**
 	 * Remove media + olatmovie
 	 * @return

src/main/java/org/olat/course/nodes/gta/ui/EditHTMLTaskController.java

@@ -79,6 +79,8 @@ public class EditHTMLTaskController extends FormBasicController {
 		descriptionEl = uifactory.addTextAreaElement("descr", "task.description", 2048, 10, -1, true, description, formLayout);
 
 		contentEditor = new HTMLEditorController(ureq, getWindowControl(), taskContainer, task.getFilename(), null, "media", true, false, false, mainForm);
+		contentEditor.getRichTextConfiguration().disableImageAnMovie();
+		contentEditor.getRichTextConfiguration().disableFileBrowserCallback();
 		listenTo(contentEditor);
 		FormItem editorItem = contentEditor.getInitialFormItem();
 		editorItem.setLabel("task.file", null);

src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java

@@ -279,6 +279,8 @@ public class GTASampleSolutionsEditController extends FormBasicController {
 				solutionContainer, documentName, "media", true, true);
 		newSolutionEditorCtrl.setNewFile(true);
 		newSolutionEditorCtrl.setUserObject(solution);
+		newSolutionEditorCtrl.getRichTextConfiguration().disableImageAnMovie();
+		newSolutionEditorCtrl.getRichTextConfiguration().disableFileBrowserCallback();
 		listenTo(newSolutionEditorCtrl);
 		
 		cmc = new CloseableModalController(getWindowControl(), "close", newSolutionEditorCtrl.getInitialComponent());
@@ -291,6 +293,8 @@ public class GTASampleSolutionsEditController extends FormBasicController {
 
 		editSolutionEditorCtrl = WysiwygFactory.createWysiwygController(ureq, getWindowControl(),
 				solutionContainer, documentName, "media", true, true);
+		editSolutionEditorCtrl.getRichTextConfiguration().disableImageAnMovie();
+		editSolutionEditorCtrl.getRichTextConfiguration().disableFileBrowserCallback();
 		listenTo(editSolutionEditorCtrl);
 		
 		cmc = new CloseableModalController(getWindowControl(), "close", editSolutionEditorCtrl.getInitialComponent());

src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java

@@ -401,6 +401,8 @@ class SubmitDocumentsController extends FormBasicController {
 	
 			newDocumentEditorCtrl = WysiwygFactory.createWysiwygController(ureq, getWindowControl(),
 					documentsContainer, documentName, "media", true, true);
+			newDocumentEditorCtrl.getRichTextConfiguration().disableImageAnMovie();
+			newDocumentEditorCtrl.getRichTextConfiguration().disableFileBrowserCallback();
 			newDocumentEditorCtrl.setNewFile(true);
 			listenTo(newDocumentEditorCtrl);
 			
@@ -415,6 +417,8 @@ class SubmitDocumentsController extends FormBasicController {
 
 		editDocumentEditorCtrl = WysiwygFactory.createWysiwygController(ureq, getWindowControl(),
 				documentsContainer, documentName, "media", true, true);
+		editDocumentEditorCtrl.getRichTextConfiguration().disableImageAnMovie();
+		editDocumentEditorCtrl.getRichTextConfiguration().disableFileBrowserCallback();
 		listenTo(editDocumentEditorCtrl);
 		
 		cmc = new CloseableModalController(getWindowControl(), "close", editDocumentEditorCtrl.getInitialComponent());