Skip to content
Snippets Groups Projects
Commit f9eefd30 authored by srosse's avatar srosse
Browse files

OO-1655: fix resources import

parent af0b76b4
No related branches found
No related tags found
No related merge requests found
...@@ -59,6 +59,7 @@ import org.olat.core.logging.OLog; ...@@ -59,6 +59,7 @@ import org.olat.core.logging.OLog;
import org.olat.core.logging.Tracing; import org.olat.core.logging.Tracing;
import org.olat.core.util.ArrayHelper; import org.olat.core.util.ArrayHelper;
import org.olat.core.util.CodeHelper; import org.olat.core.util.CodeHelper;
import org.olat.core.util.StringHelper;
import org.olat.core.util.ValidationStatus; import org.olat.core.util.ValidationStatus;
import org.olat.core.util.WebappHelper; import org.olat.core.util.WebappHelper;
import org.olat.core.util.component.FormComponentTraverser; import org.olat.core.util.component.FormComponentTraverser;
...@@ -322,18 +323,13 @@ public class Form extends LogDelegator { ...@@ -322,18 +323,13 @@ public class Form extends LogDelegator {
HttpServletRequest req = ureq.getHttpReq(); HttpServletRequest req = ureq.getHttpReq();
try { try {
for(Part part:req.getParts()) { for(Part part:req.getParts()) {
String contentType = part.getContentType();
String name = part.getName(); String name = part.getName();
String contentType = part.getContentType();
if(contentType == null) { String fileName = part.getSubmittedFileName();
String value = IOUtils.toString(part.getInputStream()); if(StringHelper.containsNonWhitespace(fileName)) {
addRequestParameter(name, value);
} else {
File tmpFile = new File(WebappHelper.getTmpDir(), "upload-" + CodeHelper.getGlobalForeverUniqueID()); File tmpFile = new File(WebappHelper.getTmpDir(), "upload-" + CodeHelper.getGlobalForeverUniqueID());
part.write(tmpFile.getAbsolutePath()); part.write(tmpFile.getAbsolutePath());
String fileName = part.getSubmittedFileName();
// Cleanup IE filenames that are absolute // Cleanup IE filenames that are absolute
int slashpos = fileName.lastIndexOf("/"); int slashpos = fileName.lastIndexOf("/");
if (slashpos != -1) fileName = name.substring(slashpos + 1); if (slashpos != -1) fileName = name.substring(slashpos + 1);
...@@ -343,6 +339,9 @@ public class Form extends LogDelegator { ...@@ -343,6 +339,9 @@ public class Form extends LogDelegator {
requestMultipartFiles.put(name, tmpFile); requestMultipartFiles.put(name, tmpFile);
requestMultipartFileNames.put(name, fileName); requestMultipartFileNames.put(name, fileName);
requestMultipartFileMimeTypes.put(name, contentType); requestMultipartFileMimeTypes.put(name, contentType);
} else {
String value = IOUtils.toString(part.getInputStream());
addRequestParameter(name, value);
} }
part.delete(); part.delete();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment