Fix async uploads with encryption

[jirafeau_mojo42.git] / lib / functions.js

diff --git a/lib/functions.js b/lib/functions.js
index 2aa3bd68c9975115b48932bc36269857a54ea548..24c7df36f876e29deb920665655232ba1ded7aad 100755 (executable)
--- a/lib/functions.js
+++ b/lib/functions.js
@@ -18,16 +18,16 @@
 
 function show_link (url, reference, delete_code, crypt_key, date)
 {
 
 function show_link (url, reference, delete_code, crypt_key, date)
 {

-    var download_link = url + 'file.php?h=' + reference;
-    var download_link_href = url + 'file.php?h=' + reference;
+    var download_link = url + 'f.php?h=' + reference;
+    var download_link_href = url + 'f.php?h=' + reference;

     if (crypt_key.length > 0)
     {
         download_link += '&k=' + crypt_key;
         download_link_href += '&k=' + crypt_key;
     }
 
     if (crypt_key.length > 0)
     {
         download_link += '&k=' + crypt_key;
         download_link_href += '&k=' + crypt_key;
     }
 

-    var delete_link = url + 'file.php?h=' + reference + '&d=' + delete_code;
-    var delete_link_href = url + 'file.php?h=' + reference + '&d=' + delete_code;
+    var delete_link = url + 'f.php?h=' + reference + '&d=' + delete_code;
+    var delete_link_href = url + 'f.php?h=' + reference + '&d=' + delete_code;

 
     document.getElementById('upload_link').innerHTML = download_link;
     document.getElementById('upload_link').href = download_link_href;
 
     document.getElementById('upload_link').innerHTML = download_link;
     document.getElementById('upload_link').href = download_link_href;


@@ -62,7 +62,7 @@ function upload_progress (e)
      */
     var p = Math.round (e.loaded * 100 / e.total);
     if (p == 100)
      */
     var p = Math.round (e.loaded * 100 / e.total);
     if (p == 100)

-        show_upload_progression ('Finalizing ...');
+        show_upload_progression (' ');

     else
         show_upload_progression (p.toString() + '%');
 }
     else
         show_upload_progression (p.toString() + '%');
 }


@@ -180,7 +180,7 @@ function async_upload_progress (e)
         return;
     var p = Math.round ((e.loaded + async_global_transfered) * 100 / (async_global_file.size));
     if (p == 100)
         return;
     var p = Math.round ((e.loaded + async_global_transfered) * 100 / (async_global_file.size));
     if (p == 100)

-        show_upload_progression ('Finalizing...');
+        show_upload_progression (' ');

     else
         show_upload_progression (p.toString() + '%');
 }
     else
         show_upload_progression (p.toString() + '%');
 }