Merge OpenOLAT 10.5 to OpenOLAT default branch with 38674fa7548d127cb41ef220c61c394c7015bc03

src/main/java/org/olat/core/commons/modules/bc/commands/CmdEditMeta.java

@@ -119,7 +119,10 @@ public class CmdEditMeta extends BasicController implements FolderCommand {
 	private String getResourceURL(WindowControl wControl) {
 		String path = "path=" + folderComponent.getCurrentContainerPath();
 		if(currentItem != null) {
-			path += "/" + currentItem.getName();
+			if(path.charAt(path.length() - 1) != '/') {
+				path += currentItem.getName();
+			}
+			path += currentItem.getName();
 		}
 		OLATResourceable ores = OresHelper.createOLATResourceableTypeWithoutCheck(path);
 		WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, wControl);

src/main/java/org/olat/core/util/vfs/VFSMediaResource.java

@@ -57,6 +57,7 @@ public class VFSMediaResource implements MediaResource {
 		return true;
 	}
 
+	@Override
 	public String getContentType() {
 		String mimeType;
 		if(downloadable) {
@@ -87,24 +88,28 @@ public class VFSMediaResource implements MediaResource {
 		return mimeType;
 	}
 
+	@Override
 	public Long getSize() {
 		long size = vfsLeaf.getSize();
 		return (size == VFSConstants.UNDEFINED) ? null : new Long(size);
 	}
 
+	@Override
 	public InputStream getInputStream() {
 		filesInfoMBean.logDownload(getSize());
 		return vfsLeaf.getInputStream();
 	}
 
+	@Override
 	public Long getLastModified() {
-		long size = vfsLeaf.getLastModified();
-		return (size == VFSConstants.UNDEFINED) ? null : new Long(size);
+		long lastModified = vfsLeaf.getLastModified();
+		return (lastModified == VFSConstants.UNDEFINED) ? null : new Long(lastModified);
 	}
 
 	/**
 	 * @see org.olat.core.gui.media.MediaResource#prepare(javax.servlet.http.HttpServletResponse)
 	 */
+	@Override
 	public void prepare(HttpServletResponse hres) {
 		String filename = StringHelper.urlEncodeUTF8(vfsLeaf.getName());
 		if (unknownMimeType) {
@@ -114,6 +119,7 @@ public class VFSMediaResource implements MediaResource {
 		}
 	}
 
+	@Override
 	public void release() {
 	// nothing to do here
 	}

src/main/java/org/olat/modules/wiki/WikiMainController.java

@@ -717,9 +717,17 @@ public class WikiMainController extends BasicController implements CloneableCont
 
 
 	private void deliverMediaFile(UserRequest ureq, String command) {
-		VFSLeaf leaf = (VFSLeaf)WikiManager.getInstance().getMediaFolder(ores).resolve(command);
-		if(leaf == null) showError("wiki.error.file.not.found");
-		else ureq.getDispatchResult().setResultingMediaResource(new VFSMediaResource(leaf));
+		VFSItem item = WikiManager.getInstance().getMediaFolder(ores).resolve(command);
+		if(item == null) {
+			//try to replace blanck with _
+			item = WikiManager.getInstance().getMediaFolder(ores).resolve(command.replace(" ", "_"));
+		}
+		if(item instanceof VFSLeaf) {
+			ureq.getDispatchResult()
+				.setResultingMediaResource(new VFSMediaResource((VFSLeaf)item));
+		} else {
+			showError("wiki.error.file.not.found");
+		}
 	}
 
 

src/main/java/org/olat/modules/wiki/gui/components/wikiToHtml/WikiMarkupRenderer.java

@@ -40,6 +40,7 @@ import org.olat.core.gui.render.Renderer;
 import org.olat.core.gui.render.StringOutput;
 import org.olat.core.gui.render.URLBuilder;
 import org.olat.core.gui.translator.Translator;
+import org.olat.core.helpers.Settings;
 import org.olat.core.logging.OLATRuntimeException;
 import org.olat.core.util.Formatter;
 
@@ -112,7 +113,8 @@ public class WikiMarkupRenderer extends DefaultComponentRenderer {
 		sb.append("</div>");
 		//set targets of media, image and external links to target "_blank" 
 		sb.append("<script type=\"text/javascript\">/* <![CDATA[ */ ");
-		sb.append("changeAnchorTargets('").append(uniqueId).append("');");
+		String instanceUrl = Settings.getServerContextPathURI();
+		sb.append("changeAnchorTargets('").append(uniqueId).append("','").append(instanceUrl).append("');");
 		sb.append("/* ]]> */</script>");
 	}
 }

src/main/webapp/static/js/openolat/wiki.js

@@ -9,7 +9,7 @@ if (clientPC.indexOf('opera') != -1) {
 	var is_opera_seven = (window.opera && document.childNodes);
 }
 
-function changeAnchorTargets(id) {
+function changeAnchorTargets(id, hostUrl) {
 	jQuery('a', jQuery('#' + id)).each(function(index, el) {
 		var anchor = jQuery(el);
 		var openInNewWindow = false;
@@ -28,7 +28,9 @@ function changeAnchorTargets(id) {
 		//open media links in new window, but only if file exists
 		if (anchor.attr("title")) {
 			var href = anchor.attr("href");
-			if (!anchor.attr("class") && anchor.attr("title").indexOf("Media:") != -1) { //normal media link file found
+			if(href.indexOf(hostUrl) == 0) {
+				openInNewWindow = false;
+			} else if (!anchor.attr("class") && anchor.attr("title").indexOf("Media:") != -1) { //normal media link file found
 				openInNewWindow = true;
 				//modify link to non ajax mode as opening in new window with ajax mode on fails
 				if (href.indexOf(":1/") != -1) {
@@ -38,9 +40,9 @@ function changeAnchorTargets(id) {
 					anchor.prop('onclick', null).off('click');
 				}
 			} else if (anchor.attr("class") == "edit" && anchor.attr("title").indexOf("Media:") != -1) { //media file not found
-				href = href.substr(0, href.indexOf("Edit:topic"));
-				href = href+"Upload";
-				anchor.attr("href", href);
+				var startHref = href.substr(0, href.indexOf("Special:Edit:topic="));
+				var endHref = href.substr(href.indexOf("Special:Edit:topic=") + "Special:Edit:topic=".length);
+				anchor.attr("href", startHref + "Media:" + endHref);
 			}
 		}
 		if (openInNewWindow) {