X-Git-Url: https://git.p6c8.net/jirafeau/pcanterino.git/blobdiff_plain/d9c69f9b8fa039888cd23e53c040df0e8ca8e56c..85b2138b521c5632019b81b347c4ebe0ef0af745:/lib/functions.js.php?ds=inline diff --git a/lib/functions.js.php b/lib/functions.js.php index 4e95747..efa82e5 100644 --- a/lib/functions.js.php +++ b/lib/functions.js.php @@ -346,11 +346,32 @@ function control_selected_file_size(max_size, error_str) // display options document.getElementById('options').style.display = 'block'; document.getElementById('send').style.display = 'block'; + document.getElementById('send').disabled = false; document.getElementById('error_pop').style.display = 'none'; document.getElementById('send').focus(); } } +// UX-only: script.php enforces disallowed_extensions independently, this +// 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.replace(/[\s.]+$/, ''); + f_ext = f_name.includes('.') ? f_name.split('.').pop().toLowerCase() : ''; + if (disallowed_extensions.includes(f_ext)) + { + // 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; + } +} + function XHRErrorHandler(e) { var text = "${e.type}: ${e.loaded} bytes transferred" @@ -430,9 +451,9 @@ function classic_upload (file, time, password, one_time) req.upload.addEventListener ("progress", upload_progress, false); req.addEventListener ("error", XHRErrorHandler, false); req.addEventListener ("abort", XHRErrorHandler, false); - req.onreadystatechange = function () + req.onload = function () { - if (req.readyState == 4 && req.status == 200) + if (req.status === 200) { var res = req.responseText; @@ -480,8 +501,8 @@ function classic_upload (file, time, password, one_time) function check_html5_file_api () { - // Enforce legacy upload is enabled through config! + if (isset($cfg['debug_enforce_classic_upload']) && $cfg['debug_enforce_classic_upload']) { ?> + // Enforce classic upload is enabled through config! return false;