git.p6c8.net
/
jirafeau_mojo42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Translated using Weblate (Swedish)
[jirafeau_mojo42.git]
/
lib
/
functions.js.php
diff --git
a/lib/functions.js.php
b/lib/functions.js.php
index 8ce56d3946e2ebe5d444fbd493379c5c965b8494..ebf8531ac414aeb26655f1ab68ed1efdab4d88ae 100644
(file)
--- a/
lib/functions.js.php
+++ b/
lib/functions.js.php
@@
-1,7
+1,7
@@
<?php
/*
* Jirafeau, your web file repository
<?php
/*
* Jirafeau, your web file repository
- * Copyright (C) 2015 Jerome Jutteau <j
.jutteau@gmail.com
>
+ * Copyright (C) 2015 Jerome Jutteau <j
erome@jutteau.fr
>
* Copyright (C) 2015 Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
*
* This program is free software: you can redistribute it and/or modify
* Copyright (C) 2015 Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
*
* This program is free software: you can redistribute it and/or modify
@@
-370,6
+370,10
@@
function classic_upload (file, time, password, one_time, upload_password)
show_link (res[0], res[1], res[2], expiryDate);
}
show_link (res[0], res[1], res[2], expiryDate);
}
+ else
+ {
+ pop_failure ("<?php echo t("ERR_OCC"); ?>");
+ }
}
req.open ("POST", 'script.php' , true);
}
req.open ("POST", 'script.php' , true);
@@
-398,6
+402,7
@@
var async_global_ref = '';
var async_global_max_size = 0;
var async_global_time;
var async_global_transfering = 0;
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)
{
function async_upload_start (max_size, file, time, password, one_time, upload_password)
{
@@
-470,6
+475,7
@@
function async_upload_progress (e)
function async_upload_push (code)
{
function async_upload_push (code)
{
+ async_global_last_code = code;
if (async_global_transfered == async_global_file.size)
{
hide_upload_progression ();
if (async_global_transfered == async_global_file.size)
{
hide_upload_progression ();
@@
-482,27
+488,38
@@
function async_upload_push (code)
req.addEventListener ("abort", pop_failure, false);
req.onreadystatechange = function ()
{
req.addEventListener ("abort", pop_failure, 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))
+ 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);
+ }
+ else
{
{
- pop_failure (res);
- return;
+ if (req.status == 413) // Request Entity Too Large
+ {
+ // lower async_global_max_size and retry
+ async_global_max_size = parseInt (async_global_max_size * 0.8);
+ }
+ async_upload_push (async_global_last_code);
}
}
-
- 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);
}
}
req.open ("POST", 'script.php?push_async' , true);
- var chunk_size = parseInt (async_global_max_size * 0.50);
var start = async_global_transfered;
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);
if (end >= async_global_file.size)
end = async_global_file.size;
var blob = async_global_file.slice (start, end);
@@
-560,8
+577,7
@@
function upload (max_size)
{
var one_time_checkbox = document.getElementById('one_time_download');
var one_time = one_time_checkbox !== null ? one_time_checkbox.checked : false;
{
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 ()
- && document.getElementById('file_select').files[0].size >= max_size)
+ if (check_html5_file_api ())
{
async_upload_start (
max_size,
{
async_upload_start (
max_size,
patrick-canterino.de