aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
diff options
context:
space:
mode:
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
index 8887aeaad..bee2ba06c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
@@ -31,6 +31,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
@@ -48,7 +50,8 @@ public class OAFileUploadValidation {
private static final Logger log = Logger.getLogger(OASSOConfigValidation.class);
- public List<String> validate(List<String> fileName, List<File> files, String errorMsgPreFix, Map<String, byte[]> output) {
+ public List<String> validate(List<String> fileName, List<File> files,
+ String errorMsgPreFix, Map<String, byte[]> output, HttpServletRequest request) {
List<String> errors = new ArrayList<String>();
@@ -56,7 +59,7 @@ public class OAFileUploadValidation {
if (fileName.size() > 1) {
log.info("Only one BKU-selecten template file can be stored");
- errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.selected"));
+ errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.selected", request));
}
for (int i=0; i<fileName.size(); i++) {
@@ -65,7 +68,7 @@ public class OAFileUploadValidation {
if (MiscUtil.isNotEmpty(filename)) {
if (ValidationHelper.containsPotentialCSSCharacter(filename, false)) {
log.info("Filename is not valid");
- errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".filename.valid"));
+ errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".filename.valid", request));
} else {
try {
@@ -78,7 +81,7 @@ public class OAFileUploadValidation {
log.info("File with FileName "
+ filename +" can not be loaded." , e);
errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.valid",
- new Object[] {filename} ));
+ new Object[] {filename}, request ));
}
}
}