Fixes #16 Permits to authenticate administrator using HTTP auth

[jirafeau_mojo42.git] / lib / functions.js

diff --git a/lib/functions.js b/lib/functions.js
old mode 100755 (executable)
new mode 100644 (file)
index 2aa3bd6..ee8c6e8
--- a/lib/functions.js
+++ b/lib/functions.js
@@ -1,6 +1,6 @@
 /*
  *  Jirafeau, your web file repository
- *  Copyright (C) 2012  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
@@ -18,16 +18,16 @@
 
 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 += '&amp;k=' + crypt_key;
         download_link_href += '&k=' + crypt_key;
     }
 
-    var delete_link = url + 'file.php?h=' + reference + '&amp;d=' + delete_code;
-    var delete_link_href = url + 'file.php?h=' + reference + '&d=' + delete_code;
+    var delete_link = url + 'f.php?h=' + reference + '&amp;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;
@@ -62,7 +62,7 @@ function upload_progress (e)
      */
     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() + '%');
 }
@@ -73,7 +73,7 @@ function upload_failed (e)
     alert ('Sorry, upload failed');
 }
 
-function classic_upload (url, file, time, password, one_time)
+function classic_upload (url, file, time, password, one_time, upload_password)
 {
     var req = new XMLHttpRequest ();
     req.upload.addEventListener ("progress", upload_progress, false);
@@ -118,6 +118,9 @@ function classic_upload (url, file, time, password, one_time)
         form.append ("key", password);
     if (one_time)
         form.append ("one_time_download", '1');
+    if (upload_password.length > 0)
+        form.append ("upload_password", upload_password);
+
     req.send (form);
 }
 
@@ -136,7 +139,7 @@ var async_global_max_size = 0;
 var async_global_time;
 var async_global_transfering = 0;
 
-function async_upload_start (url, max_size, file, time, password, one_time)
+function async_upload_start (url, max_size, file, time, password, one_time, upload_password)
 {
     async_global_transfered = 0;
     async_global_url = url;
@@ -171,6 +174,9 @@ function async_upload_start (url, max_size, file, time, password, one_time)
         form.append ("key", password);
     if (one_time)
         form.append ("one_time_download", '1');
+    if (upload_password.length > 0)
+        form.append ("upload_password", upload_password);
+
     req.send (form);
 }
 
@@ -180,7 +186,7 @@ function async_upload_progress (e)
         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() + '%');
 }
@@ -278,7 +284,8 @@ function upload (url, max_size)
             document.getElementById('file_select').files[0],
             document.getElementById('select_time').value,
             document.getElementById('input_key').value,
-            document.getElementById('one_time_download').checked
+            document.getElementById('one_time_download').checked,
+            document.getElementById('upload_password').value
             );
     }
     else
@@ -287,7 +294,8 @@ function upload (url, max_size)
             document.getElementById('file_select').files[0],
             document.getElementById('select_time').value,
             document.getElementById('input_key').value,
-            document.getElementById('one_time_download').checked
+            document.getElementById('one_time_download').checked,
+            document.getElementById('upload_password').value
             );
     }
 }