Index: lams_admin/web/import/importGroups.jsp =================================================================== diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) +++ lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -7,10 +7,10 @@ <%@ page import="org.lamsfoundation.lams.usermanagement.OrganisationType" %> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> -<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> -<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> <%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> <%= OrganisationType.CLASS_TYPE %> <%= OrganisationType.COURSE_TYPE %> Index: lams_admin/web/import/importexcel.jsp =================================================================== diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision c9e22b65129fe7561d7e66f5d6338557b0f3236a) +++ lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -4,7 +4,7 @@ <%@ page import="org.lamsfoundation.lams.admin.service.IImportService"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> -<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%> <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%> @@ -13,7 +13,7 @@ <%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%> <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> -<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> <%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java =================================================================== diff -u -rfd067e2f01c881d99c717983bdeb4ce64df77db2 -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java (.../LAMSConnectorServlet.java) (revision fd067e2f01c881d99c717983bdeb4ce64df77db2) +++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java (.../LAMSConnectorServlet.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -41,7 +41,7 @@ import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.FileUtil; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -330,7 +330,7 @@ String fileName = pathParts[pathParts.length - 1]; // validate file size - boolean maxFilesizeExceededMessage = FileValidatorSpringUtil.validateFileSize(uplFile.getSize(), true); + boolean maxFilesizeExceededMessage = FileValidatorUtil.validateFileSize(uplFile.getSize(), true); if (!maxFilesizeExceededMessage) { //assign fileName an error message to be shown on a client side fileName = messageService.getMessage("errors.maxfilesize", Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java =================================================================== diff -u -r738886899fd098b8cc2112c5e7974a9921a29c25 -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java (.../LAMSUploadServlet.java) (revision 738886899fd098b8cc2112c5e7974a9921a29c25) +++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java (.../LAMSUploadServlet.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -26,7 +26,7 @@ import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.FileUtil; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.UploadFileUtil; import org.springframework.util.FileCopyUtils; @@ -116,7 +116,7 @@ String fileName = pathParts[pathParts.length - 1]; // validate file size - boolean maxFilesizeExceededMessage = FileValidatorSpringUtil.validateFileSize(uplFile.getSize(), true); + boolean maxFilesizeExceededMessage = FileValidatorUtil.validateFileSize(uplFile.getSize(), true); if (!maxFilesizeExceededMessage) { fileName = messageService.getMessage("errors.maxfilesize", new Object[] { Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE) }); Fisheye: Tag c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorSpringUtil.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java (.../FileValidatorUtil.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java (.../FileValidatorUtil.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -25,18 +25,8 @@ import java.text.NumberFormat; -import javax.servlet.http.HttpServletRequest; +import org.springframework.web.multipart.MultipartFile; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.validator.Field; -import org.apache.commons.validator.Validator; -import org.apache.commons.validator.ValidatorAction; -import org.apache.commons.validator.util.ValidatorUtils; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.upload.FormFile; -import org.springframework.validation.Errors; - /** * This class is used by commons validator. To validate various properties * related to any uploaded files @@ -46,72 +36,19 @@ public class FileValidatorUtil { public static final String LARGE_FILE = "largeFile"; - private static final String MSG_KEY = "errors.maxfilesize"; + public static final String MSG_KEY = "errors.maxfilesize"; /** - * To enable this validator copy the XML entry below to validator-rules.xml - * * - * Then to validate your uploaded file size, by placing it under the corresponding
tag - * - * We could also use maxFileSize to validated large file sizes by setting the largeFile flag - * to true - * - * - * largeFile - * true - * - * - * - * You need to add an errors.maxfilesize entry to your resource bundle or you can change - * the "msg" attribute in the "validator" tag above. The maximum file size is pass to - * the message as arg0. So the following message or something similar could be used. - * errors.maxfilesize=The uploaded file has exceeded the maximum file size limit of {0} bytes - */ - public static boolean validateFileSize(Object bean, ValidatorAction va, Field field, ActionMessages errors, - Validator validator, HttpServletRequest request) { - - int fileSize = 0; - try { - String fileSizeStr = ValidatorUtils.getValueAsString(bean, field.getProperty()); - fileSize = Integer.parseInt(fileSizeStr); - } catch (Exception e) { - //catch null point exception: e.g., offlineFile.fileSize, if offlineFile is null, - //ValidatorUtils.getValueAsString() will throw null. - //skip, do nothing - return true; - } - - boolean largeFile = Boolean.valueOf(field.getVarValue(LARGE_FILE)).booleanValue(); - //so far put message into GLOABLE_MESSAGE rather than special key - return FileValidatorUtil.validateFileSize(fileSize, largeFile, ActionMessages.GLOBAL_MESSAGE, errors); - } - - /** - * * @param file * @param largeFile * @param errors * @return Be careful, if the file size is under maximum size, return TRUE. Otherwise, return false. */ - public static boolean validateFileSize(FormFile file, boolean largeFile, ActionMessages errors) { - return FileValidatorUtil.validateFileSize(file, largeFile, ActionMessages.GLOBAL_MESSAGE, errors); - - } - - public static boolean validateFileSize(FormFile file, boolean largeFile, Errors errors) { - int fileSize = 0; + public static boolean validateFileSize(MultipartFile file, boolean largeFile) { + Long fileSize = 0L; try { - fileSize = file.getFileSize(); + fileSize = file.getSize(); } catch (Exception e) { //skip, do nothing return true; @@ -123,63 +60,18 @@ String maxSize = FileValidatorUtil.formatSize(maxFileSize); // set error message - errors.reject(MSG_KEY, new Object[] { maxSize }, null); return false; } return true; - } - /** - * - * @param file - * @param largeFile - * @param errorKey - * the key in ActionMessages(errorKey,ActionMessage()); - * @param errors - * @return Be careful, if the file size is under maximum size, return TRUE. Otherwise, return false. - */ - public static boolean validateFileSize(FormFile file, boolean largeFile, String errorKey, ActionMessages errors) { - int fileSize = 0; - try { - fileSize = file.getFileSize(); - } catch (Exception e) { - //skip, do nothing - return true; - } - - return FileValidatorUtil.validateFileSize(fileSize, largeFile, errorKey, errors); - } - - /** - * - * @param file - * @param largeFile - * @return return null if file size is below max filesize, otherwise, return error message - */ - public static ActionMessage validateFileSize(FileItem file, boolean largeFile) { - int fileSize = (int) file.getSize(); - ActionMessages errors = new ActionMessages(); - - ActionMessage errorMessage = null; - boolean isMaxFilesizeExceeded = !FileValidatorUtil.validateFileSize(fileSize, largeFile, - ActionMessages.GLOBAL_MESSAGE, errors); - if (isMaxFilesizeExceeded) { - errorMessage = (ActionMessage)errors.get().next(); - } - - return errorMessage; - } - - private static boolean validateFileSize(int fileSize, boolean largeFile, String errorKey, ActionMessages errors) { + public static boolean validateFileSize(Long fileSize, boolean largeFile) { float maxFileSize = largeFile ? Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE) : Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE); if (fileSize > maxFileSize) { String maxSize = FileValidatorUtil.formatSize(maxFileSize); - // set error message - errors.add(errorKey, new ActionMessage(MSG_KEY, maxSize)); return false; } return true; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -59,7 +59,7 @@ import org.lamsfoundation.lams.tool.daco.web.form.RecordForm; import org.lamsfoundation.lams.tool.daco.web.form.ReflectionForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.NumberUtil; import org.lamsfoundation.lams.util.WebUtil; @@ -786,7 +786,7 @@ new Object[] { questionNumber })); } } else { - FileValidatorSpringUtil.validateFileSize(file, true); + FileValidatorUtil.validateFileSize(file, true); } fileNumber++; } @@ -815,7 +815,7 @@ errorMap.add("GLOBAL", messageService.getMessage( DacoConstants.ERROR_MSG_RECORD_IMAGE_FORMAT, new Object[] { questionNumber })); } else { - FileValidatorSpringUtil.validateFileSize(file, true); + FileValidatorUtil.validateFileSize(file, true); } } fileNumber++; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java =================================================================== diff -u -r56d688cfa2d286f1c63e48ed58b53dad40b0ed9e -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java (.../MessageForm.java) (revision 56d688cfa2d286f1c63e48ed58b53dad40b0ed9e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java (.../MessageForm.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -30,7 +30,7 @@ import org.lamsfoundation.lams.tool.forum.persistence.Attachment; import org.lamsfoundation.lams.tool.forum.persistence.Message; import org.lamsfoundation.lams.util.FileUtil; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -91,7 +91,7 @@ largeFile = false; } - FileValidatorSpringUtil.validateFileSize(this.getAttachmentFile(), largeFile); + FileValidatorUtil.validateFileSize(this.getAttachmentFile(), largeFile); } catch (Exception e) { MessageForm.logger.error("", e); Index: lams_tool_forum/web/jsps/authoring/message/create.jsp =================================================================== diff -u -r084f494736aefde70938e39eded1a334f0886e5f -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision 084f494736aefde70938e39eded1a334f0886e5f) +++ lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -2,8 +2,8 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration" %> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> -<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> -<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> +<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> Index: lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp =================================================================== diff -u -r98901fbfc777fa7907f4643646147c0c0286fa20 -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp (.../msgattachment.jsp) (revision 98901fbfc777fa7907f4643646147c0c0286fa20) +++ lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp (.../msgattachment.jsp) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -1,8 +1,8 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration" %> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> -<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> -<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> +<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java =================================================================== diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java (.../ImageGalleryUtils.java) (revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java (.../ImageGalleryUtils.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -6,7 +6,7 @@ import org.apache.commons.lang.StringUtils; import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageGalleryItemForm; import org.lamsfoundation.lams.tool.imageGallery.web.form.MultipleImagesForm; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -29,7 +29,7 @@ MultiValueMap errorMap = new LinkedMultiValueMap<>(); // validate file size - FileValidatorSpringUtil.validateFileSize(itemForm.getFile(), largeFile); + FileValidatorUtil.validateFileSize(itemForm.getFile(), largeFile); // for edit validate: file already exist if (!itemForm.isHasFile() && ((itemForm.getFile() == null) || StringUtils.isEmpty(itemForm.getFile().getOriginalFilename()))) { @@ -59,7 +59,7 @@ // validate files size for (MultipartFile file : fileList) { - FileValidatorSpringUtil.validateFileSize(file, largeFile); + FileValidatorUtil.validateFileSize(file, largeFile); // check for allowed format : gif, png, jpg String contentType = file.getContentType(); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -58,7 +58,7 @@ import org.lamsfoundation.lams.tool.commonCartridge.web.form.CommonCartridgePedagogicalPlannerForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.CommonConstants; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -769,7 +769,7 @@ // } if (itemForm.getItemType() == CommonCartridgeConstants.RESOURCE_TYPE_COMMON_CARTRIDGE) { // validate item size - FileValidatorSpringUtil.validateFileSize(itemForm.getFile(), true); + FileValidatorUtil.validateFileSize(itemForm.getFile(), true); // for edit validate: file already exist if (!itemForm.isHasFile() && (itemForm.getFile() == null || StringUtils.isEmpty(itemForm.getFile().getName()))) { Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java (.../CommonCartridgePedagogicalPlannerForm.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java (.../CommonCartridgePedagogicalPlannerForm.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -31,7 +31,7 @@ import org.lamsfoundation.lams.tool.commonCartridge.CommonCartridgeConstants; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -77,7 +77,7 @@ * File should be saved already or it should be provided. This functionality required some * changes in pedagogicalPlanner.js in lams_central (see prepareFormData() there) */ - FileValidatorSpringUtil.validateFileSize(file.get(index), true); + FileValidatorUtil.validateFileSize(file.get(index), true); if (fileUuid.get(index) == null && file.get(index) == null) { errorMap.add("GLOBAL", messageService.getMessage("error.planner.file.blank", new Object[] { index + 1 })); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java =================================================================== diff -u -r5c34a04ef321a5a0c211fd830ee52eadc90b89ad -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 5c34a04ef321a5a0c211fd830ee52eadc90b89ad) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -66,7 +66,7 @@ import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -912,7 +912,7 @@ || resourceItemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT || resourceItemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_FILE) { // validate item size - if (!FileValidatorSpringUtil.validateFileSize(resourceItemForm.getFile(), false)) { + if (!FileValidatorUtil.validateFileSize(resourceItemForm.getFile(), false)) { errorMap.add("GLOBAL", messageService.getMessage("errors.maxfilesize", new Object[] { Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE) })); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -60,7 +60,7 @@ import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.FileUtil; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -618,7 +618,7 @@ } // validate item size - if (!FileValidatorSpringUtil.validateFileSize(resourceItemForm.getFile(), false)) { + if (!FileValidatorUtil.validateFileSize(resourceItemForm.getFile(), false)) { errorMap.add("GLOBAL", messageService.getMessage("errors.maxfilesize", new Object[] { Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE) })); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java (.../ResourcePedagogicalPlannerForm.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java (.../ResourcePedagogicalPlannerForm.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -31,7 +31,7 @@ import org.lamsfoundation.lams.tool.rsrc.ResourceConstants; import org.lamsfoundation.lams.tool.rsrc.model.Resource; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -73,7 +73,7 @@ * File should be saved already or it should be provided. This functionality required some * changes in pedagogicalPlanner.js in lams_central (see prepareFormData() there) */ - boolean fileSizeValid = FileValidatorSpringUtil.validateFileSize(file.get(index), true); + boolean fileSizeValid = FileValidatorUtil.validateFileSize(file.get(index), true); if (!fileSizeValid) { if (fileUuid.get(index) == null && file.get(index) == null) { errorMap.add("GLOBAL", messageService.getMessage("error.planner.file.blank", Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp (.../addfile.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp (.../addfile.jsp) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -2,9 +2,9 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration" %> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> -<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> -<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> <%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp =================================================================== diff -u -r280d5dec6be0fb026eb13b77a507e454ac0219ba -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp (.../addlearningobject.jsp) (revision 280d5dec6be0fb026eb13b77a507e454ac0219ba) +++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp (.../addlearningobject.jsp) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -2,9 +2,9 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration" %> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> -<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> -<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp (.../addwebsite.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp (.../addwebsite.jsp) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -2,9 +2,9 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration" %> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> -<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> -<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -43,7 +43,7 @@ import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.FileUtil; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -293,7 +293,7 @@ MultiValueMap errorMap = new LinkedMultiValueMap<>(); // validate file size - FileValidatorSpringUtil.validateFileSize(itemForm.getFile(), true); + FileValidatorUtil.validateFileSize(itemForm.getFile(), true); // for edit validate: file already exist if (!itemForm.isHasFile() && ((itemForm.getFile() == null) || StringUtils.isEmpty(itemForm.getFile().getOriginalFilename()))) { Index: lams_tool_pixlr/web/pages/authoring/authoring.jsp =================================================================== diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_pixlr/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision b7b682644cd1d20e061092b1411eeb679a1f9fb2) +++ lams_tool_pixlr/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -3,9 +3,9 @@ <%@ page import="org.lamsfoundation.lams.tool.pixlr.util.PixlrConstants"%> <%@ page import="org.lamsfoundation.lams.util.Configuration" %> <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> -<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> +<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> -<%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> +<%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -59,7 +59,6 @@ import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.FileUtil; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; @@ -417,7 +416,7 @@ errorMap.add("GLOBAL", messageService.getMessage("errors.maxdescsize")); } - boolean fileSizeValid = FileValidatorSpringUtil.validateFileSize(learnerForm.getFile().getSize(), false); + boolean fileSizeValid = FileValidatorUtil.validateFileSize(learnerForm.getFile().getSize(), false); if (!fileSizeValid) { errorMap.add("GLOBAL", messageService.getMessage("errors.maxfilesize", new Object[] { Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE) })); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java (.../LearningController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) @@ -61,7 +61,7 @@ import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.DateUtil; -import org.lamsfoundation.lams.util.FileValidatorSpringUtil; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -525,7 +525,7 @@ // validate file size MultiValueMap errorMap = new LinkedMultiValueMap<>(); - boolean fileSizeValid = FileValidatorSpringUtil.validateFileSize(file, false); + boolean fileSizeValid = FileValidatorUtil.validateFileSize(file, false); if (!fileSizeValid) { errorMap.add("GLOBAL", messageService.getMessage("errors.maxfilesize", new Object[] { Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE) }));