Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r46690f9897a1d36d9ed0314876d309948ed0adea -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 46690f9897a1d36d9ed0314876d309948ed0adea) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -490,7 +490,6 @@ button.select.importfile = Select file to import label.upload.info = Uploaded file must be an Excel file and not exceed size of {0} errors.maxfilesize = Uploaded file exceeded maximum size: {0} -error.attachment.not.xls = File is not an Excel .xls file. sysadmin.maintain.session = Logged in users sysadmin.maintain.session.login = Login sysadmin.maintain.session.id = Session ID Index: lams_admin/web/import/importGroups.jsp =================================================================== diff -u -r0559504eae34958a1b85105cedeff10e591a52cf -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision 0559504eae34958a1b85105cedeff10e591a52cf) +++ lams_admin/web/import/importGroups.jsp (.../importGroups.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -69,17 +69,7 @@ // its format is: upload__ 'tmpFileUploadId' : tmpFileUploadId, 'largeFilesAllowed' : true - }, - onBeforeFileAdded: function(currentFile, files) { - var name = currentFile.data.name, - extensionIndex = name.lastIndexOf('.'), - valid = allowedFileTypes.includes(name.substring(extensionIndex).trim()); - if (!valid) { - uppy.info('', 'error', 10000); - } - - return valid; - } + } }; switch(language) { Index: lams_admin/web/import/importexcel.jsp =================================================================== diff -u -re88830091139dd447cdd6a7f30c129c777104dac -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision e88830091139dd447cdd6a7f30c129c777104dac) +++ lams_admin/web/import/importexcel.jsp (.../importexcel.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -68,17 +68,7 @@ // its format is: upload__ 'tmpFileUploadId' : tmpFileUploadId, 'largeFilesAllowed' : true - }, - onBeforeFileAdded: function(currentFile, files) { - var name = currentFile.data.name, - extensionIndex = name.lastIndexOf('.'), - valid = allowedFileTypes.includes(name.substring(extensionIndex).trim()); - if (!valid) { - uppy.info('', 'error', 10000); - } - - return valid; - } + } }; switch(language) { Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r3f1a7cbc1c960cdad9bf3cd6ca6400e8788aca68 -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3f1a7cbc1c960cdad9bf3cd6ca6400e8788aca68) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -918,7 +918,6 @@ label.import.xml = Import questions in XML format label.export.xml = Export questions in XML format msg.import.file.format = The import file must be .xml file exported from assessment tool and not exceed size of {0} -error.import.file.format = The import file is not an .xml file. label.qb.stats.title = Question statistics error.qb.permanent.remove = The question is in one collection only, so it would be permanently removed.\\nIt is not possible as the question is used in sequences. label.qb.permanent.remove.confirm = The question is in one collection only. Are you sure that you want to remove it permanently? @@ -1072,7 +1071,6 @@ label.authoring.feeback.correct = Feedback on any correct response label.authoring.feeback.partially.correct = Feedback on any partially correct response label.authoring.feeback.incorrect = Feedback on any incorrect response -error.ld.zip.file = Only zip files allowed # MS Word file template for importing questions into LAMS label.download.word.template = Download Microsoft Word template authoring.tbl.import.questions.from = Import questions from Index: lams_central/web/qb/importQuestionsXml.jsp =================================================================== diff -u -r0559504eae34958a1b85105cedeff10e591a52cf -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_central/web/qb/importQuestionsXml.jsp (.../importQuestionsXml.jsp) (revision 0559504eae34958a1b85105cedeff10e591a52cf) +++ lams_central/web/qb/importQuestionsXml.jsp (.../importQuestionsXml.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -67,17 +67,7 @@ // its format is: upload__ 'tmpFileUploadId' : tmpFileUploadId, 'largeFilesAllowed' : true - }, - onBeforeFileAdded: function(currentFile, files) { - var name = currentFile.data.name, - extensionIndex = name.lastIndexOf('.'), - valid = allowedFileTypes.includes(name.substring(extensionIndex).trim()); - if (!valid) { - uppy.info('', 'error', 10000); - } - - return valid; - } + } }; switch(language) { Index: lams_central/web/questions/questionFile.jsp =================================================================== diff -u -r6be02ec52741cbf8567561435ca56c48d8b45f5a -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_central/web/questions/questionFile.jsp (.../questionFile.jsp) (revision 6be02ec52741cbf8567561435ca56c48d8b45f5a) +++ lams_central/web/questions/questionFile.jsp (.../questionFile.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -74,17 +74,7 @@ // its format is: upload__ 'tmpFileUploadId' : tmpFileUploadId, 'largeFilesAllowed' : true - }, - onBeforeFileAdded: function(currentFile, files) { - var name = currentFile.data.name, - extensionIndex = name.lastIndexOf('.'), - valid = allowedFileTypes.includes(name.substring(extensionIndex).trim()); - if (!valid) { - uppy.info('', 'error', 10000); - } - - return valid; - } + } }; switch(language) { Index: lams_central/web/toolcontent/import.jsp =================================================================== diff -u -r0559504eae34958a1b85105cedeff10e591a52cf -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision 0559504eae34958a1b85105cedeff10e591a52cf) +++ lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -60,17 +60,7 @@ // its format is: upload__ 'tmpFileUploadId' : tmpFileUploadId, 'largeFilesAllowed' : false - }, - onBeforeFileAdded: function(currentFile, files) { - var name = currentFile.data.name, - extensionIndex = name.lastIndexOf('.'), - valid = allowedFileTypes.includes(name.substring(extensionIndex).trim()); - if (!valid) { - uppy.info('', 'error', 10000); - } - - return valid; - } + } }; switch(language) { Index: lams_tool_forum/web/includes/javascript/message.js =================================================================== diff -u -rdd681787ec25a920574ec033e3740572818dbce6 -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_forum/web/includes/javascript/message.js (.../message.js) (revision dd681787ec25a920574ec033e3740572818dbce6) +++ lams_tool_forum/web/includes/javascript/message.js (.../message.js) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -106,7 +106,7 @@ onBeforeFileAdded: function(currentFile, files) { var name = currentFile.data.name, extensionIndex = name.lastIndexOf('.'), - valid = extensionIndex < 0 || !EXE_FILE_TYPES.includes(name.substring(extensionIndex).trim()); + valid = extensionIndex < 0 || !EXE_FILE_TYPES.includes(name.substring(extensionIndex).trim().toLowerCase()); if (!valid) { uppy.info(EXE_FILE_ERROR, 'error', 10000); } Index: lams_tool_images/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_images/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision aa932dd995a61adeed918456c6257a4a9a9cea74) +++ lams_tool_images/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -66,8 +66,6 @@ output.desc.learner.number.of.images.uploaded = Number of images uploaded output.desc.learner.number.of.comments = Number of comments posted output.desc.learner.number.of.votes = Number of images selected as favourite -error.resource.image.not.alowed.format = Allowed file formats: gif, png, jpg -error.resource.image.not.alowed.format.for = Error occurred uploading {0}. Allowed file formats: gif, png, jpg error.resource.item.file.blank = File can not be blank. error.resource.image.comment.blank = Comment can not be blank. error.upload.failed = Upload file failed: {0} Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java =================================================================== diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -66,8 +66,6 @@ public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; // error message keys - public static final String ERROR_MSG_NOT_ALLOWED_FORMAT = "error.resource.image.not.alowed.format"; - public static final String ERROR_MSG_NOT_ALLOWED_FORMAT_FOR = "error.resource.image.not.alowed.format.for"; public static final String ERROR_MSG_FILE_BLANK = "error.resource.item.file.blank"; public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed"; public static final String ERROR_MSG_REQUIRED_FIELDS_MISSING = "error.required.fields.missing"; Index: lams_tool_images/web/includes/javascript/imageGalleryitem.js =================================================================== diff -u -r80f23aae24a17df9dfcd1770f396aaba0d0650c3 -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_images/web/includes/javascript/imageGalleryitem.js (.../imageGalleryitem.js) (revision 80f23aae24a17df9dfcd1770f396aaba0d0650c3) +++ lams_tool_images/web/includes/javascript/imageGalleryitem.js (.../imageGalleryitem.js) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -79,17 +79,7 @@ // for server-side file type validation; consistent with CKEditor parameter 'Type' : 'Image', 'largeFilesAllowed' : true - }, - onBeforeFileAdded: function(currentFile, files) { - var name = currentFile.data.name || currentFile.name, - extensionIndex = name.lastIndexOf('.'), - valid = UPLOAD_ALLOWED_EXTENSIONS.includes(name.substring(extensionIndex).trim()); - if (!valid) { - uppy.info(LABEL_NOT_ALLOWED_FORMAT, 'error', 10000); - } - - return valid; - } + } }; switch(language) { Index: lams_tool_images/web/pages/authoring/authoring.jsp =================================================================== diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_images/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 1a6408137fed60838b5744155f0884381c37d2c0) +++ lams_tool_images/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -24,7 +24,6 @@ // convert Java syntax to JSON var UPLOAD_ALLOWED_EXTENSIONS = JSON.parse("[" + "${ALLOWED_EXTENSIONS_IMAGE}".replace(/\.\w+/g, '"$&"') + "]"); var LABEL_ITEM_BLANK = ''; - var LABEL_NOT_ALLOWED_FORMAT = ''; Index: lams_tool_images/web/pages/learning/learning.jsp =================================================================== diff -u -r0559504eae34958a1b85105cedeff10e591a52cf -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_images/web/pages/learning/learning.jsp (.../learning.jsp) (revision 0559504eae34958a1b85105cedeff10e591a52cf) +++ lams_tool_images/web/pages/learning/learning.jsp (.../learning.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -49,7 +49,6 @@ // convert Java syntax to JSON var UPLOAD_ALLOWED_EXTENSIONS = JSON.parse("[" + "${ALLOWED_EXTENSIONS_IMAGE}".replace(/\.\w+/g, '"$&"') + "]"); var LABEL_ITEM_BLANK = ''; - var LABEL_NOT_ALLOWED_FORMAT = ''; Index: lams_tool_images/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 1a6408137fed60838b5744155f0884381c37d2c0) +++ lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -65,7 +65,6 @@ // convert Java syntax to JSON var UPLOAD_ALLOWED_EXTENSIONS = JSON.parse("[" + "${ALLOWED_EXTENSIONS_IMAGE}".replace(/\.\w+/g, '"$&"') + "]"); var LABEL_ITEM_BLANK = ''; - var LABEL_NOT_ALLOWED_FORMAT = ''; Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp =================================================================== diff -u -r80f23aae24a17df9dfcd1770f396aaba0d0650c3 -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp (.../addfile.jsp) (revision 80f23aae24a17df9dfcd1770f396aaba0d0650c3) +++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp (.../addfile.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -8,7 +8,7 @@ var extensionValidation = function(currentFile, files) { var name = currentFile.data.name || currentFile.name, extensionIndex = name.lastIndexOf('.'), - valid = extensionIndex < 0 || !EXE_FILE_TYPES.includes(name.substring(extensionIndex).trim()); + valid = extensionIndex < 0 || !EXE_FILE_TYPES.includes(name.substring(extensionIndex).trim().toLowerCase()); if (!valid) { uppy.info(EXE_FILE_ERROR, 'error', 10000); } Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp =================================================================== diff -u -r2b9d5a9ee7968957c73fa1311ec9274725d4cfe3 -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision 2b9d5a9ee7968957c73fa1311ec9274725d4cfe3) +++ lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -80,7 +80,7 @@ onBeforeFileAdded: function(currentFile, files) { var name = currentFile.data.name || currentFile.name, extensionIndex = name.lastIndexOf('.'), - valid = extensionIndex < 0 || !EXE_FILE_TYPES.includes(name.substring(extensionIndex).trim()); + valid = extensionIndex < 0 || !EXE_FILE_TYPES.includes(name.substring(extensionIndex).trim().toLowerCase()); if (!valid) { uppy.info(EXE_FILE_ERROR, 'error', 10000); } Index: lams_tool_task/web/pages/learning/learning.jsp =================================================================== diff -u -re28fe624a0c9761166375a90de55c7869a77670e -rbc66c534c18e8e49ce8ed510418400cbc56fd605 --- lams_tool_task/web/pages/learning/learning.jsp (.../learning.jsp) (revision e28fe624a0c9761166375a90de55c7869a77670e) +++ lams_tool_task/web/pages/learning/learning.jsp (.../learning.jsp) (revision bc66c534c18e8e49ce8ed510418400cbc56fd605) @@ -178,7 +178,7 @@ onBeforeFileAdded: function(currentFile, files) { var name = currentFile.data.name, extensionIndex = name.lastIndexOf('.'), - valid = extensionIndex < 0 || !EXE_FILE_TYPES.includes(name.substring(extensionIndex).trim()); + valid = extensionIndex < 0 || !EXE_FILE_TYPES.includes(name.substring(extensionIndex).trim().toLowerCase()); if (!valid) { uppy.info(EXE_FILE_ERROR, 'error', 10000); }