admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MARX#84827 Geen early-exit-tak inschieten als we nog niet hoeven te exit'en

Browse Source 
svn path=/Website/branches/v2024.2/; revision=65754
This commit is contained in:
Koen Reefman
2024-07-29 12:06:41 +00:00
parent 57e596bcf8
commit b05ec800b1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
APPL/API/api_hmail.asp
View File

@@ -429,6 +429,10 @@ function checkAttach(xmlReq, xmlParameter, emlSetting)
var safefilename = safe.filename(XMLval(Attachments[i], "filename", i)); var safefilename = safe.filename(XMLval(Attachments[i], "filename", i));
var extension = safefilename.substr(safefilename.lastIndexOf(".")); var extension = safefilename.substr(safefilename.lastIndexOf("."));
var attsize = parseInt(XMLval(Attachments[i], "size", i), 10); 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")) if (safefilename == S("fac_logo_file"))
{ // Waarschijnlijk een FACILITOR bon gereply'd { // Waarschijnlijk een FACILITOR bon gereply'd
__Log("Bijlage {0} genegeerd.".format(safefilename)); __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)); __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. __Log(L("fac_email_setting_err1").format(safefilename, filesize_MB, maxsize_MB));
var maxsize_MB = (emlSetting.attach_maxkb / 1024).toFixed(3); // attach_maxkb in in kB. Maak er MB van. rejectedFiles.tekst.push(L("fac_email_setting_err1").format(safefilename, filesize_MB, maxsize_MB));
if (parseFloat(filesize_MB) > parseFloat(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)) else if (!new RegExp(S("flexallowedext"), "ig").test(safefilename))
{ // Niet ondersteunde bestandstype { // Niet ondersteunde bestandstype