Fixes #17 Add links for preview and direct download after uploading

[jirafeau_project.git] / lib / functions.js

diff --git a/lib/functions.js b/lib/functions.js
old mode 100755 (executable)
new mode 100644 (file)
index 2dcde55..ccd13d3
--- 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
@@ -16,15 +16,81 @@
  *  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;
-    document.getElementById('upload_link').innerHTML = download_link;
-    document.getElementById('upload_link').href = download_link;
+    // Download page if element exists
+    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;
+    }
+    if (!!document.getElementById('upload_finished_download_page'))
+    {
+        document.getElementById('upload_link').innerHTML = download_link;
+        document.getElementById('upload_link').href = download_link_href;
+    }
+
+    // Is the preview allowed ?
+    if (!!document.getElementById('preview_link'))
+    {
+        document.getElementById('upload_finished_preview').style.display = 'none';
+        var preview_link = url + 'f.php?h=' + reference + '&amp;p=1';
+        var preview_link_href = url + 'f.php?h=' + reference + '&p=1';
+        if (crypt_key.length > 0)
+        {
+            preview_link += '&amp;k=' + crypt_key;
+            preview_link_href += '&k=' + crypt_key;
+        }
+
+        // Test if content can be previewed
+         type = document.getElementById('file_select').files[0].type;
+         if (type.indexOf("image") > -1 ||
+             type.indexOf("audio") > -1 ||
+             type.indexOf("text") > -1 ||
+             type.indexOf("video") > -1)
+         {
+            document.getElementById('preview_link').innerHTML = preview_link;
+            document.getElementById('preview_link').href = preview_link_href;
+            document.getElementById('upload_finished_preview').style.display = '';
+         }
+    }
+
+    // Only show link to password page if password is set
+    document.getElementById('upload_password_page').style.display = 'none';
+    if (document.getElementById('input_key').value.length > 0)
+    {
+        if (!!document.getElementById('upload_finished_download_page'))
+            document.getElementById('upload_finished_download_page').style.display = 'none';
+        document.getElementById('upload_password_page').style.display = '';
+        if (!!document.getElementById('upload_finished_preview'))
+            document.getElementById('upload_finished_preview').style.display = 'none';
+        document.getElementById('upload_direct_download').style.display = 'none';
+
+        document.getElementById('password_link').innerHTML = download_link;
+        document.getElementById('password_link').href = download_link_href;
+    }
+    // Direct download link
+    else
+    {
+        var direct_download_link = url + 'f.php?h=' + reference + '&amp;d=1';
+        var direct_download_link_href = url + 'f.php?h=' + reference + '&d=1';
+        if (crypt_key.length > 0)
+        {
+            direct_download_link += '&amp;k=' + crypt_key;
+            direct_download_link_href += '&k=' + crypt_key;
+        }
+        document.getElementById('direct_link').innerHTML = direct_download_link;
+        document.getElementById('direct_link').href = direct_download_link_href;
+    }
+
+    // Delete link
+    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('delete_link').innerHTML = delete_link;
     document.getElementById('delete_link').href = delete_link_href;
+
     if (date)
     {
         document.getElementById('date').innerHTML = date;
@@ -52,8 +118,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.
      */
-    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)
@@ -62,7 +131,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);
@@ -91,10 +160,10 @@ function classic_upload (url, file, time, password, one_time)
                     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
-                show_link (url, res[0], res[1]);
+                show_link (url, res[0], res[1], res[2]);
         }
     }
     req.open ("POST", url + 'script.php' , true);
@@ -107,6 +176,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);
 }
 
@@ -125,7 +197,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;
@@ -160,6 +232,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);
 }
 
@@ -167,8 +242,11 @@ function async_upload_progress (e)
 {
     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)
@@ -197,7 +275,7 @@ function async_upload_push (code)
     }
     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)
@@ -240,10 +318,10 @@ function async_upload_end (code)
                     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
-                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);
@@ -264,7 +342,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
@@ -273,7 +352,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
             );
     }
 }