close #419

helpers/filemiddlewares.js

@@ -25,9 +25,10 @@ const { debugLogs } = require(__dirname+'/../configs/secrets.js')
 			const fileSizeLimit = globalLimits[`${fileType}FilesSize`];
 			const fileNumLimit = globalLimits[`${fileType}Files`];
 			const fileNumLimitFunction = (req, res, next) => {
+				const isPostform = req.path.endsWith('/post') || req.path.endsWith('/modpost');
 				return dynamicResponse(req, res, 400, 'message', {
 					'title': 'Too many files',
-					'message': (req.path.endsWith('/post') && res.locals.board) ? `Max files per post ${res.locals.board.settings.maxFiles < globalLimits.postFiles.max ? 'on this board ' : ''}is ${res.locals.board.settings.maxFiles}`
+					'message': (isPostform && res.locals.board) ? `Max files per post ${res.locals.board.settings.maxFiles < globalLimits.postFiles.max ? 'on this board ' : ''}is ${res.locals.board.settings.maxFiles}`
 						: `Max files per request is ${fileNumLimit.max}`,
 					'redirect': req.headers.referer
 				});

models/forms/makepost.js

@@ -55,9 +55,18 @@ module.exports = async (req, res, next) => {
 		lockReset, captchaReset, pphTrigger, tphTrigger, tphTriggerAction, pphTriggerAction,
 		maxFiles, sageOnlyEmail, forceAnon, replyLimit, disableReplySubject,
 		captchaMode, lockMode, allowedFileTypes, customFlags, geoFlags, fileR9KMode, messageR9KMode } = res.locals.board.settings;
+	if (res.locals.numFiles > maxFiles) {
+		await deleteTempFiles(req).catch(e => console.error);
+		return dynamicResponse(req, res, 400, 'message', {
+			'title': 'Too many files',
+			'message': `Max files per post on this board is ${maxFiles}`,
+			'redirect': req.headers.referer
+		});
+	}
 	if (res.locals.permLevel >= 4
 		&& res.locals.country
 		&& blockedCountries.includes(res.locals.country.code)) {
+		await deleteTempFiles(req).catch(e => console.error);
 		return dynamicResponse(req, res, 403, 'message', {
 			'title': 'Forbidden',
 			'message': `Your country "${res.locals.country.name}" is not allowed to post on this board`,