Add .gitignore for var-* and lib/config.local.php

[jirafeau_mojo42.git] / lib / functions.js

diff --git a/lib/functions.js b/lib/functions.js
index 2dcde55f39528ced6dfc9e1b02a1cc085de0f4e2..8922e0e820ff99bb2192c6b65349e27296be518c 100755 (executable)
--- a/lib/functions.js
+++ b/lib/functions.js
@@ -16,13 +16,21 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-function show_link (url, reference, delete_code, date)
+function show_link (url, reference, delete_code, crypt_key, date)

 {
 {

-    var download_link = url + 'file.php?h=' + reference;
-    var delete_link = download_link + '&amp;d=' + delete_code;
-    var delete_link_href = download_link + '&d=' + delete_code;
+    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 + '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').innerHTML = download_link;

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

     document.getElementById('delete_link').innerHTML = delete_link;
     document.getElementById('delete_link').href = delete_link_href;
     if (date)
     document.getElementById('delete_link').innerHTML = delete_link;
     document.getElementById('delete_link').href = delete_link_href;
     if (date)


@@ -52,8 +60,11 @@ function upload_progress (e)
     /* Show the user the operation do not reach 100%, the server need time
      * to give a response before providing the link.
      */
     /* Show the user the operation do not reach 100%, the server need time
      * to give a response before providing the link.
      */

-    var p = Math.round (e.loaded * 99 / e.total);
-    show_upload_progression (p.toString() + '%');
+    var p = Math.round (e.loaded * 100 / e.total);
+    if (p == 100)
+        show_upload_progression (' ');
+    else
+        show_upload_progression (p.toString() + '%');

 }
 
 function upload_failed (e)
 }
 
 function upload_failed (e)


@@ -62,7 +73,7 @@ function upload_failed (e)
     alert ('Sorry, upload failed');
 }
 
     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);
 {
     var req = new XMLHttpRequest ();
     req.upload.addEventListener ("progress", upload_progress, false);


@@ -91,10 +102,10 @@ function classic_upload (url, file, time, password, one_time)
                     d.setSeconds (d.getSeconds() + 2419200);
                 else
                     return;
                     d.setSeconds (d.getSeconds() + 2419200);
                 else
                     return;

-                show_link (url, res[0], res[1], d.toString());
+                show_link (url, res[0], res[1], res[2], d.toString());

             }
             else
             }
             else

-                show_link (url, res[0], res[1]);
+                show_link (url, res[0], res[1], res[2]);

         }
     }
     req.open ("POST", url + 'script.php' , true);
         }
     }
     req.open ("POST", url + 'script.php' , true);


@@ -107,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');
         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);
 }
 
     req.send (form);
 }
 


@@ -125,7 +139,7 @@ var async_global_max_size = 0;
 var async_global_time;
 var async_global_transfering = 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;
 {
     async_global_transfered = 0;
     async_global_url = url;


@@ -160,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');
         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);
 }
 
     req.send (form);
 }
 


@@ -167,8 +184,11 @@ function async_upload_progress (e)
 {
     if (!e.lengthComputable && async_global_file.size != 0)
         return;
 {
     if (!e.lengthComputable && async_global_file.size != 0)
         return;

-    var p = Math.round ((e.loaded + async_global_transfered) * 99 / (async_global_file.size));
-    show_upload_progression (p.toString() + '%');
+    var p = Math.round ((e.loaded + async_global_transfered) * 100 / (async_global_file.size));
+    if (p == 100)
+        show_upload_progression (' ');
+    else
+        show_upload_progression (p.toString() + '%');

 }
 
 function async_upload_push (code)
 }
 
 function async_upload_push (code)


@@ -197,7 +217,7 @@ function async_upload_push (code)
     }
     req.open ("POST", async_global_url + 'script.php?push_async' , true);
 
     }
     req.open ("POST", async_global_url + 'script.php?push_async' , true);
 

-    var chunk_size = parseInt (async_global_max_size * 0.90);
+    var chunk_size = parseInt (async_global_max_size * 0.50);

     var start = async_global_transfered;
     var end = start + chunk_size;
     if (end >= async_global_file.size)
     var start = async_global_transfered;
     var end = start + chunk_size;
     if (end >= async_global_file.size)


@@ -240,10 +260,10 @@ function async_upload_end (code)
                     d.setSeconds (d.getSeconds() + 2419200);
                 else
                     return;
                     d.setSeconds (d.getSeconds() + 2419200);
                 else
                     return;

-                show_link (async_global_url, res[0], res[1], d.toString());
+                show_link (async_global_url, res[0], res[1], res[2], d.toString());

             }
             else
             }
             else

-                show_link (async_global_url, res[0], res[1]);
+                show_link (async_global_url, res[0], res[1], res[2]);

         }
     }
     req.open ("POST", async_global_url + 'script.php?end_async' , true);
         }
     }
     req.open ("POST", async_global_url + 'script.php?end_async' , true);


@@ -264,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('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
             );
     }
     else


@@ -273,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('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

             );
     }
 }
             );
     }
 }