X-Git-Url: https://git.p6c8.net/jirafeau/pcanterino.git/blobdiff_plain/71c90eed43ddf3b42af7aef81e77e6c883706f16..b8fdbeedafcd3fc113a2b2c5ef8f2f814b691f4a:/lib/functions.js.php diff --git a/lib/functions.js.php b/lib/functions.js.php index 656108b..65febf1 100644 --- a/lib/functions.js.php +++ b/lib/functions.js.php @@ -356,11 +356,16 @@ function control_selected_file_size(max_size, error_str) // just warns the user before they submit a doomed upload. function control_selected_file_extension(disallowed_extensions, error_str) { - f_name = document.getElementById('file_select').files[0].name; - f_ext = f_name.includes('.') ? f_name.split('.').pop().toLowerCase() : ''; - if (disallowed_extensions.includes(f_ext)) + f_name = document.getElementById('file_select').files[0].name.replace(/[\s.]+$/, '').toLowerCase(); + // suffix match so that compound extensions such as 'tar.gz' work too + if (disallowed_extensions.some(function (ext) { return f_name.endsWith('.' + ext); })) { - pop_failure(error_str); + // control_selected_file_size runs first: keep its error, if any, and add ours + var error_pop = document.getElementById('error_pop'); + if (error_pop.style.display === 'none') + pop_failure(error_str); + else + error_pop.innerHTML += '
' + error_str; // keep the button visible but disabled so the user sees it is forbidden document.getElementById('send').style.display = 'block'; document.getElementById('send').disabled = true;