<?php
/*
* Jirafeau, your web file repository
- * Copyright (C) 2015 Jerome Jutteau <j.jutteau@gmail.com>
+ * Copyright (C) 2015 Jerome Jutteau <jerome@jutteau.fr>
* Copyright (C) 2015 Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
*
* This program is free software: you can redistribute it and/or modify
// Email link
var filename = document.getElementById('file_select').files[0].name;
- var b = encodeURIComponent("<?php echo t("DL"); ?> \"" + filename + "\":") + "%0D";
- b += encodeURIComponent(web_root + download_link_href) + "%0D";
+ var b = encodeURIComponent("<?php echo t("DL"); ?> \"" + filename + "\":") + "%0D" + "%0A";
+ b += encodeURIComponent(web_root + download_link_href) + "%0D" + "%0A";
if (false == isEmpty(date))
{
- b += "%0D" + encodeURIComponent("<?php echo t("VALID_UNTIL"); ?>: " + date.format('YYYY-MM-DD hh:mm (GMT O)')) + "%0D";
+ b += "%0D" + "%0A" + encodeURIComponent("<?php echo t("VALID_UNTIL"); ?>: " + date.format('YYYY-MM-DD hh:mm (GMT O)')) + "%0D" + "%0A";
document.getElementById('upload_link_email').href = "mailto:?body=" + b + "&subject=" + encodeURIComponent(filename);
}
}
}
+function XHRErrorHandler(e)
+{
+ var text = "${e.type}: ${e.loaded} bytes transferred"
+ console.log(text)
+}
+
function pop_failure (e)
{
- var text = "An error occured";
+ var text = "<p>An error occured";
if (typeof e !== 'undefined')
- text = e;
- text = "<p>" + text + "</p>";
+ text += ": " + e;
+ text += "</p>";
document.getElementById('error_pop').innerHTML = e;
document.getElementById('uploading').style.display = 'none';
}
if (time == 'month')
{
- d.setSeconds (d.getSeconds() + 2419200);
+ d.setSeconds (d.getSeconds() + 2592000);
return true;
}
if (time == 'quarter')
{
- d.setSeconds (d.getSeconds() + 7257600);
+ d.setSeconds (d.getSeconds() + 7776000);
return true;
}
if (time == 'year')
{
- d.setSeconds (d.getSeconds() + 29030400);
+ d.setSeconds (d.getSeconds() + 31536000);
return true;
}
return false;
var req = new XMLHttpRequest ();
req.upload.addEventListener ("progress", upload_progress, false);
- req.addEventListener ("error", pop_failure, false);
- req.addEventListener ("abort", pop_failure, false);
+ req.addEventListener ("error", XHRErrorHandler, false);
+ req.addEventListener ("abort", XHRErrorHandler, false);
req.onreadystatechange = function ()
{
if (req.readyState == 4 && req.status == 200)
show_link (res[0], res[1], res[2], expiryDate);
}
+ else
+ {
+ pop_failure ("<?php echo t("ERR_OCC"); ?>");
+ }
}
req.open ("POST", 'script.php' , true);
var async_global_max_size = 0;
var async_global_time;
var async_global_transfering = 0;
+var async_global_last_code;
function async_upload_start (max_size, file, time, password, one_time, upload_password)
{
async_global_time = time;
var req = new XMLHttpRequest ();
- req.addEventListener ("error", pop_failure, false);
- req.addEventListener ("abort", pop_failure, false);
+ req.addEventListener ("error", XHRErrorHandler, false);
+ req.addEventListener ("abort", XHRErrorHandler, false);
req.onreadystatechange = function ()
{
if (req.readyState == 4 && req.status == 200)
function async_upload_push (code)
{
+ async_global_last_code = code;
if (async_global_transfered == async_global_file.size)
{
hide_upload_progression ();
}
var req = new XMLHttpRequest ();
req.upload.addEventListener ("progress", async_upload_progress, false);
- req.addEventListener ("error", pop_failure, false);
- req.addEventListener ("abort", pop_failure, false);
+ req.addEventListener ("error", XHRErrorHandler, false);
+ req.addEventListener ("abort", XHRErrorHandler, false);
req.onreadystatechange = function ()
{
- if (req.readyState == 4 && req.status == 200)
+ if (req.readyState == 4)
{
- var res = req.responseText;
+ if (req.status == 200)
+ {
+ var res = req.responseText;
- if (/^Error/.test(res))
+ // This error may be triggered when Jirafeau does not receive any file in POST.
+ // This may be due to bad php configuration where post_max_size is too low
+ // comparing to upload_max_filesize. Let's retry with lower file size.
+ if (res === "Error 23")
+ {
+ async_global_max_size = Math.max(1, async_global_max_size - 500);
+ async_upload_push (async_global_last_code);
+ return;
+ }
+ else if (/^Error/.test(res))
+ {
+ pop_failure (res);
+ return;
+ }
+
+ res = res.split ("\n");
+ var code = res[0]
+ async_global_transfered = async_global_transfering;
+ async_upload_push (code);
+ return;
+ }
+ else
{
- pop_failure (res);
+ if (req.status == 413) // Request Entity Too Large
+ {
+ // lower async_global_max_size and retry
+ async_global_max_size = Math.max(1, parseInt (async_global_max_size * 0.8));
+ }
+ async_upload_push (async_global_last_code);
return;
}
-
- res = res.split ("\n");
- var code = res[0]
- async_global_transfered = async_global_transfering;
- async_upload_push (code);
}
}
req.open ("POST", 'script.php?push_async' , true);
- var chunk_size = parseInt (async_global_max_size * 0.50);
var start = async_global_transfered;
- var end = start + chunk_size;
+ var end = start + async_global_max_size;
if (end >= async_global_file.size)
end = async_global_file.size;
var blob = async_global_file.slice (start, end);
function async_upload_end (code)
{
var req = new XMLHttpRequest ();
- req.addEventListener ("error", pop_failure, false);
- req.addEventListener ("abort", pop_failure, false);
+ req.addEventListener ("error", XHRErrorHandler, false);
+ req.addEventListener ("abort", XHRErrorHandler, false);
req.onreadystatechange = function ()
{
if (req.readyState == 4 && req.status == 200)
function upload (max_size)
{
- if (check_html5_file_api ()
- && document.getElementById('file_select').files[0].size >= max_size)
+ var one_time_checkbox = document.getElementById('one_time_download');
+ var one_time = one_time_checkbox !== null ? one_time_checkbox.checked : false;
+ if (check_html5_file_api ())
{
async_upload_start (
max_size,
document.getElementById('file_select').files[0],
document.getElementById('select_time').value,
document.getElementById('input_key').value,
- document.getElementById('one_time_download').checked,
+ one_time,
document.getElementById('upload_password').value
);
}
document.getElementById('file_select').files[0],
document.getElementById('select_time').value,
document.getElementById('input_key').value,
- document.getElementById('one_time_download').checked,
+ one_time,
document.getElementById('upload_password').value
);
}
if (s <= 1000)
{
res = s.toString();
- scale = "Bit/s";
+ scale = "B/s";
}
else if (s < 1000000)
{
res = Math.floor(s/100) / 10;
- scale = "KBit/s";
+ scale = "KB/s";
}
else
{
res = Math.floor(s/100000) / 10;
- scale = "Mbit/s";
+ scale = "MB/s";
}
if (res == 0)
return '';
}
function addCopyListener(button_id, link_id) {
- document.getElementById(button_id)
+ if(document.getElementById(button_id)){
+ document.getElementById(button_id)
.addEventListener("click", function() {
copyLinkToClipboard(link_id);});
+ }
}
// @license-end
git.p6c8.net / jirafeau.git / blobdiff