]> git.p6c8.net - jirafeau/pcanterino.git/blobdiff - lib/functions.js.php
Escape the disallowed extensions list in the upload form's onchange attribute
[jirafeau/pcanterino.git] / lib / functions.js.php
index 35748916e76b7a1e60d89f376798be1fb58bd90a..efa82e5a3ff52dccbc89804b02322fa297d50082 100644 (file)
@@ -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';
         // 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();
     }
 }
 
         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 += '<br />' + 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"
 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.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;
 
         {
             var res = req.responseText;
 

patrick-canterino.de