From: Dan Untenzu <untenzu@webit.de>
Date: Fri, 27 Jan 2017 09:23:50 +0000 (+0100)
Subject: [BUGFIX] Catch errors in upload form
X-Git-Tag: 3.0.0~13
X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/169cbfa6f1d566deba92eb3ac559cba01588be27?ds=sidebyside;hp=--cc

[BUGFIX] Catch errors in upload form

The upload forms failed to catch errors due to a
never matching condition. Failing uploads (eg. because of
filesize limit etc.) still tried to render non-existing
download links instead of showing the error.

Fix the condition by testing if the return string
starts with "Error" instead of equals "Error".

Refs #96
---

169cbfa6f1d566deba92eb3ac559cba01588be27
diff --git a/lib/functions.js.php b/lib/functions.js.php
index dab491c..989b788 100644
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -259,11 +259,14 @@ function classic_upload (url, file, time, password, one_time, upload_password)
         if (req.readyState == 4 && req.status == 200)
         {
             var res = req.responseText;
-            if (res == "Error")
+
+            // if response starts with "Error" then show a failure
+            if (/^Error/.test(res))
             {
-                pop_failure ();
+                pop_failure (res);
                 return;
             }
+
             res = res.split ("\n");
             if (time != 'none')
             {
@@ -321,11 +324,13 @@ function async_upload_start (url, max_size, file, time, password, one_time, uplo
         if (req.readyState == 4 && req.status == 200)
         {
             var res = req.responseText;
-            if (res == "Error")
+
+            if (/^Error/.test(res))
             {
-                pop_failure ();
+                pop_failure (res);
                 return;
             }
+
             res = res.split ("\n");
             async_global_ref = res[0];
             var code = res[1];
@@ -390,11 +395,13 @@ function async_upload_push (code)
         if (req.readyState == 4 && req.status == 200)
         {
             var res = req.responseText;
-            if (res == "Error")
+
+            if (/^Error/.test(res))
             {
-                pop_failure ();
+                pop_failure (res);
                 return;
             }
+
             res = res.split ("\n");
             var code = res[0]
             async_global_transfered = async_global_transfering;
@@ -428,11 +435,13 @@ function async_upload_end (code)
         if (req.readyState == 4 && req.status == 200)
         {
             var res = req.responseText;
-            if (res == "Error")
+
+            if (/^Error/.test(res))
             {
-                pop_failure ();
+                pop_failure (res);
                 return;
             }
+
             res = res.split ("\n");
             if (async_global_time != 'none')
             {