Jirafeau 4.7.2 is ready

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

diff --git a/lib/functions.js.php b/lib/functions.js.php
index 64154d3be3c0bd481da7231df7f11eaad4174aed..cafecafcdc0f6fcd19ade0b89944ec80c86daad8 100644 (file)
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -19,12 +19,15 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
- function template_js_preview_link() {
+function template_js_preview_link()
+{
     ?>
     if (!!document.getElementById('preview_link'))
     {
         document.getElementById('upload_finished_preview').style.display = 'none';
-        var preview_link_href = 'f.php?h=' + reference + '&p=1';
+        var preview_link_href = use_shortlinks ? '' : 'f.php?h=';
+        preview_link_href += reference;
+        preview_link_href += use_shortlinks ? '?p=1' : '&p=1';
         if (crypt_key.length > 0)
         {
             preview_link_href += '&k=' + crypt_key;
@@ -44,14 +47,17 @@
         }
     } 
     <?php
- }
-function template_js_download_page() {
+}
+function template_js_download_page()
+{
     ?>
     // Download page
-    var download_link_href = 'f.php?h=' + reference;
+    var download_link_href = use_shortlinks ? '' : 'f.php?h=';
+    download_link_href += reference;
     if (crypt_key.length > 0)
     {
-        download_link_href += '&k=' + crypt_key;
+        download_link_href += use_shortlinks ? '?k=' : '&k='
+        download_link_href += crypt_key;
     }
     if (!!document.getElementById('upload_finished_download_page'))
     {
@@ -60,7 +66,8 @@ function template_js_download_page() {
     }
     <?php
 }
-function template_js_email_link() {
+function template_js_email_link()
+{
     ?>
     // Email link
     var b = encodeURIComponent("<?php echo t("DL"); ?> \"" + filename + "\":") + "%0D" + "%0A";
@@ -72,18 +79,26 @@ function template_js_email_link() {
     }
     <?php
 }
-function template_js_delete_link() {
+function template_js_delete_link()
+{
     ?>
     // Delete link
-    var delete_link_href = 'f.php?h=' + reference + '&d=' + delete_code;
+    var delete_link_href = use_shortlinks ? '' : 'f.php?h=';
+    delete_link_href += reference;
+    delete_link_href += use_shortlinks ? '?d=' : '&d=';
+    delete_link_href += delete_code;
     document.getElementById('delete_link').href = delete_link_href;
     document.getElementById('delete_link_text').innerHTML = web_root + delete_link_href;
     <?php
 }
- function template_js_direct_download() {
+function template_js_direct_download()
+{
     ?>
     // Direct download link
-    var direct_download_link_href = 'f.php?h=' + reference + '&d=1';
+    //var direct_download_link_href = 'f.php?h=' + reference + '&d=1';
+    var direct_download_link_href = use_shortlinks ? '' : 'f.php?h=';
+    direct_download_link_href += reference;
+    direct_download_link_href += use_shortlinks ? '?d=1' : '&d=1';
     if (crypt_key.length > 0)
     {
         direct_download_link_href += '&k=' + crypt_key;
@@ -91,8 +106,9 @@ function template_js_delete_link() {
     document.getElementById('direct_link').href = direct_download_link_href;
     document.getElementById('direct_link_text').innerHTML = web_root + direct_download_link_href;
     <?php
- }
- function template_js_date_function() {
+}
+function template_js_date_function()
+{
     ?>
     // Validity date
     if (isEmpty(date))
@@ -111,7 +127,7 @@ function template_js_delete_link() {
             document.getElementById('date').style.display = '';
     }
     <?php
- }
+}
 
 
 
@@ -126,6 +142,7 @@ require(JIRAFEAU_ROOT . 'lib/lang.php');
 ?>
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 var web_root = "<?php echo $cfg['web_root']; ?>";
+var use_shortlinks = <?php echo ($cfg['use_shortlinks'] === true) ? 'true' : 'false'; ?>;
 
 var lang_array = <?php echo json_lang_generator(null); ?>;
 var lang_array_fallback = <?php echo json_lang_generator("en"); ?>;
@@ -413,9 +430,9 @@ function classic_upload (file, time, password, one_time)
     req.upload.addEventListener ("progress", upload_progress, false);
     req.addEventListener ("error", XHRErrorHandler, false);
     req.addEventListener ("abort", XHRErrorHandler, false);
-    req.onreadystatechange = function ()
+    req.onload = function ()
     {
-        if (req.readyState == 4 && req.status == 200)
+        if (req.status === 200)
         {
             var res = req.responseText;
 
@@ -462,6 +479,13 @@ function classic_upload (file, time, password, one_time)
 
 function check_html5_file_api ()
 {
+<?php
+    if (isset($cfg['debug_enforce_classic_upload']) && $cfg['debug_enforce_classic_upload']) { ?>
+    // Enforce classic upload is enabled through config!
+    return false;
+<?php
+    }
+?>
     return window.File && window.FileReader && window.FileList && window.Blob;
 }