X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/f89474388394d7a7fd7dbb41f089956454e4957f..3f8ba7f9359d8909300b01269056e5c2a578e310:/lib/functions.js?ds=inline diff --git a/lib/functions.js b/lib/functions.js index fee0b50..8922e0e 100755 --- a/lib/functions.js +++ b/lib/functions.js @@ -16,13 +16,21 @@ * along with this program. If not, see . */ -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 + '&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 += '&k=' + crypt_key; + download_link_href += '&k=' + crypt_key; + } + + 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; + 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) @@ -36,6 +44,7 @@ function show_link (url, reference, delete_code, date) document.getElementById('uploading').style.display = 'none'; document.getElementById('upload').style.display = 'none'; document.getElementById('upload_finished').style.display = ''; + document.title = 'Jirafeau - 100%'; } function show_upload_progression (p) @@ -51,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. */ - 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) @@ -61,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); @@ -90,10 +102,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); @@ -106,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); } @@ -124,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; @@ -159,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); } @@ -166,8 +184,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) @@ -196,7 +217,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) @@ -239,10 +260,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); @@ -263,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 @@ -272,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 ); } }