[TASK] add default lighttpd max-request-value

[jirafeau.git] / lib / functions.js.php

diff --git a/lib/functions.js.php b/lib/functions.js.php
index 1f83ae75d08343d3f36b3c9385b16e01db7d7d89..d9a75eec7fb0badb07ac63de3997975fa06d239f 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 <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
  *  Copyright (C) 2015  Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
  *
  *  This program is free software: you can redistribute it and/or modify


@@ -558,6 +558,8 @@ function async_upload_end (code)
 
 function upload (max_size)
 {
 
 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;

     if (check_html5_file_api ()
         && document.getElementById('file_select').files[0].size >= max_size)
     {
     if (check_html5_file_api ()
         && document.getElementById('file_select').files[0].size >= max_size)
     {


@@ -566,7 +568,7 @@ function upload (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,
+            one_time,

             document.getElementById('upload_password').value
             );
     }
             document.getElementById('upload_password').value
             );
     }


@@ -576,7 +578,7 @@ function upload (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,
+            one_time,

             document.getElementById('upload_password').value
             );
     }
             document.getElementById('upload_password').value
             );
     }


@@ -621,17 +623,17 @@ function upload_time_estimation_speed_string()
     if (s <= 1000)
     {
         res = s.toString();
     if (s <= 1000)
     {
         res = s.toString();

-        scale = "Bit/s";
+        scale = "B/s";

     }
     else if (s < 1000000)
     {
         res = Math.floor(s/100) / 10;
     }
     else if (s < 1000000)
     {
         res = Math.floor(s/100) / 10;

-        scale = "KBit/s";
+        scale = "KB/s";

     }
     else
     {
         res = Math.floor(s/100000) / 10;
     }
     else
     {
         res = Math.floor(s/100000) / 10;

-        scale = "Mbit/s";
+        scale = "MB/s";

     }
     if (res == 0)
         return '';
     }
     if (res == 0)
         return '';