diff --git a/APPL/API/api_hmail.asp b/APPL/API/api_hmail.asp index 338b8dbdb9..0ef300471e 100644 --- a/APPL/API/api_hmail.asp +++ b/APPL/API/api_hmail.asp @@ -429,6 +429,10 @@ function checkAttach(xmlReq, xmlParameter, emlSetting) var safefilename = safe.filename(XMLval(Attachments[i], "filename", i)); var extension = safefilename.substr(safefilename.lastIndexOf(".")); var attsize = parseInt(XMLval(Attachments[i], "size", i), 10); + if (emlSetting.attach_maxkb && emlSetting.attach_maxkb > 0) { + var filesize_MB = (attsize / 1024 / 1024).toFixed(3); // attsize is in bytes. Maak er MB van. + var maxsize_MB = (emlSetting.attach_maxkb / 1024).toFixed(3); // attach_maxkb in in kB. Maak er MB van. + } if (safefilename == S("fac_logo_file")) { // Waarschijnlijk een FACILITOR bon gereply'd __Log("Bijlage {0} genegeerd.".format(safefilename)); @@ -437,16 +441,12 @@ function checkAttach(xmlReq, xmlParameter, emlSetting) { __Log("Bijlage {0} genegeerd, te klein met {1} bytes.".format(safefilename, attsize)); } - else if (emlSetting.attach_maxkb && emlSetting.attach_maxkb > 0) + else if ( emlSetting.attach_maxkb && emlSetting.attach_maxkb > 0 // Er is een maximum bestandsgrootte ingesteld + && parseFloat(filesize_MB) > parseFloat(maxsize_MB)) // En die is overschreden { - var filesize_MB = (attsize / 1024 / 1024).toFixed(3); // attsize is in bytes. Maak er MB van. - var maxsize_MB = (emlSetting.attach_maxkb / 1024).toFixed(3); // attach_maxkb in in kB. Maak er MB van. - if (parseFloat(filesize_MB) > parseFloat(maxsize_MB)) - { - __Log(L("fac_email_setting_err1").format(safefilename, filesize_MB, maxsize_MB)); - rejectedFiles.tekst.push(L("fac_email_setting_err1").format(safefilename, filesize_MB, maxsize_MB)); - rejectedFiles.maillog.push(("Bijlage {0} te groot: {1} bytes").format(safefilename, attsize)); - } + __Log(L("fac_email_setting_err1").format(safefilename, filesize_MB, maxsize_MB)); + rejectedFiles.tekst.push(L("fac_email_setting_err1").format(safefilename, filesize_MB, maxsize_MB)); + rejectedFiles.maillog.push(("Bijlage {0} te groot: {1} bytes").format(safefilename, attsize)); } else if (!new RegExp(S("flexallowedext"), "ig").test(safefilename)) { // Niet ondersteunde bestandstype