[BUGFIX] Prevent object ProgressEvent Error

This is done by removing unnecessary usage of web_root URL.

closes #127

Signed-off-by: Jerome Jutteau <j.jutteau@gmail.com>

diff --git a/f.php b/f.php
index 0f40638cf5508783592b7cba788d6f603ea04e58..79f437ed5a85f0ed412d2d9f2b2f19541a85c715 100644 (file)
--- a/f.php
+++ b/f.php
@@ -24,7 +24,7 @@ require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 if (!isset($_GET['h']) || empty($_GET['h'])) {
-    header('Location: ' . $cfg['web_root']);
+    header('Location: ./');
     exit;
 }
 
@@ -123,10 +123,7 @@ if (!empty($link['key'])) {
     if (!isset($_POST['key'])) {
         require(JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
-             '<form action = "';
-        echo JIRAFEAU_ABSPREFIX . 'f.php';
-        echo '" ' .
-             'method="post" id="submit_post" class="form login">'; ?>
+             '<form action="f.php" method="post" id="submit_post" class="form login">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
         echo '<fieldset>' .
              '<legend>' . t('Password protection') .
@@ -135,7 +132,7 @@ if (!empty($link['key'])) {
              '<input type = "password" name = "key" />' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
+             t('By using our services, you accept our'). ' <a href="tos.php">' . t('Terms of Service') . '</a>.' .
              '</td></tr>';
 
         if ($link['onetime'] == 'O') {
@@ -144,7 +141,7 @@ if (!empty($link['key'])) {
                  '</td></tr>';
         } ?><tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
         onclick="document.getElementById('submit_post').action='<?php
-        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
+        echo 'f.php?h=' . $link_name . '&amp;d=1';
         if (!empty($crypt_key)) {
             echo '&amp;k=' . urlencode($crypt_key);
         } ?>';
@@ -152,7 +149,7 @@ if (!empty($link['key'])) {
         if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
             onclick="document.getElementById('submit_post').action='<?php
-            echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
+            echo 'f.php?h=' . $link_name . '&amp;p=1';
             if (!empty($crypt_key)) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
@@ -179,17 +176,14 @@ if (!empty($link['key'])) {
 if (!$password_challenged && !$do_download && !$do_preview) {
     require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div>' .
-             '<form action="';
-    echo JIRAFEAU_ABSPREFIX . 'f.php';
-    echo '" ' .
-             'method="post" id="submit_post" class="form download">'; ?>
+             '<form action="f.php" method="post" id="submit_post" class="form download">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
         echo '<fieldset><legend>' . htmlspecialchars($link['file_name']) . '</legend><table>' .
              '<tr><td>' .
              t('You are about to download') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
+             t('By using our services, you accept our'). ' <a href="tos.php">' . t('Terms of Service') . '</a>.' .
              '</td></tr>';
 
     if ($link['onetime'] == 'O') {
@@ -199,7 +193,7 @@ if (!$password_challenged && !$do_download && !$do_preview) {
     } ?>
         <tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
         onclick="document.getElementById('submit_post').action='<?php
-        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
+        echo 'f.php?h=' . $link_name . '&amp;d=1';
     if (!empty($crypt_key)) {
         echo '&amp;k=' . urlencode($crypt_key);
     } ?>';
@@ -208,7 +202,7 @@ if (!$password_challenged && !$do_download && !$do_preview) {
         if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
             onclick="document.getElementById('submit_post').action='<?php
-        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
+        echo 'f.php?h=' . $link_name . '&amp;p=1';
             if (!empty($crypt_key)) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';

diff --git a/index.php b/index.php
index 7ce95327419494daad220e5ab207e554fa891c24..cd0eed839d6ba22cdc2650bfba447f299db7a79e 100644 (file)
--- a/index.php
+++ b/index.php
@@ -98,29 +98,25 @@ else {
 
     <div id="upload_finished_download_page">
     <p>
-          <?php echo t('Download page') ?>
+          <a id="upload_link" href=""><?php echo t('Download page') ?></a>
           <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
     </p>
-    <p><a id="upload_link" href=""></a></p>
     </div>
 
     <?php if ($cfg['preview'] == true) {
     ?>
     <div id="upload_finished_preview">
-    <p><?php echo t('View link') ?>:</p>
-    <p><a id="preview_link" href=""></a></p>
+    <p><a id="preview_link" href=""><?php echo t('View link') ?></a></p>
     </div>
     <?php
 } ?>
 
     <div id="upload_direct_download">
-    <p><?php echo t('Direct download link') ?>:</p>
-    <p><a id="direct_link" href=""></a></p>
+    <p><a id="direct_link" href=""><?php echo t('Direct download link') ?></a></p>
     </div>
 
     <div id="upload_delete">
-    <p><?php echo t('Delete link') ?>:</p>
-    <p><a id="delete_link" href=""></a></p>
+    <p><a id="delete_link" href=""><?php echo t('Delete link') ?></a></p>
     </div>
 
     <div id="upload_validity">
@@ -236,7 +232,7 @@ else {
     onclick="
         document.getElementById('upload').style.display = 'none';
         document.getElementById('uploading').style.display = '';
-        upload ('<?php echo $cfg['web_root']; ?>', <?php echo jirafeau_get_max_upload_size_bytes(); ?>);
+        upload (<?php echo jirafeau_get_max_upload_size_bytes(); ?>);
     "/>
     </p>
         </table>

diff --git a/install.php b/install.php
index b400988b2ac38d0f778cfe89d082eb64e1e653f0..df6c599c6bbbbfc048e82a0786c36240cfb2d270 100644 (file)
--- a/install.php
+++ b/install.php
@@ -335,7 +335,7 @@ case 4:
         jirafeau_export_cfg($cfg);
         echo '<div class="message"><p>' .
              t('Jirafeau is now fully operational') . ':' .
-             '<br /><a href="' . $cfg['web_root'] . '">' .
+             '<br /><a href="./">' .
              $cfg['web_root'].'</a></p></div>';
     }
 break;

diff --git a/lib/functions.js.php b/lib/functions.js.php
index 7ac8c7696b754d6c49b45eb1835de798df1576f7..542000b6574a96e04a1e92a8da3daa572492caa5 100644 (file)
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -113,7 +113,7 @@ function convertAllDatetimeFields() {
     }
 }
 
-function show_link (url, reference, delete_code, crypt_key, date)
+function show_link (reference, delete_code, crypt_key, date)
 {
     // Upload finished
     document.getElementById('uploading').style.display = 'none';
@@ -122,23 +122,20 @@ function show_link (url, reference, delete_code, crypt_key, date)
     document.title = 'Jirafeau - 100%';
 
     // Download page
-    var download_link = url + 'f.php?h=' + reference;
-    var download_link_href = url + 'f.php?h=' + reference;
+    var download_link_href = 'f.php?h=' + reference;
     if (crypt_key.length > 0)
     {
-        download_link += '&k=' + crypt_key;
         download_link_href += '&k=' + crypt_key;
     }
     if (!!document.getElementById('upload_finished_download_page'))
     {
-        document.getElementById('upload_link').innerHTML = download_link;
         document.getElementById('upload_link').href = download_link_href;
     }
 
     // Email link
     var filename = document.getElementById('file_select').files[0].name;
     var b = encodeURIComponent("Download file \"" + filename + "\":") + "%0D";
-    b += encodeURIComponent(download_link_href) + "%0D";
+    b += encodeURIComponent("<?php echo $cfg['web_root']; ?>" + download_link_href) + "%0D";
     if (false == isEmpty(date))
     {
         b += "%0D" + encodeURIComponent("This file will be available until " + date.format('YYYY-MM-DD hh:mm (GMT O)')) + "%0D";
@@ -146,9 +143,7 @@ function show_link (url, reference, delete_code, crypt_key, date)
     }
 
     // Delete link
-    var delete_link = url + 'f.php?h=' + reference + '&amp;d=' + delete_code;
-    var delete_link_href = url + 'f.php?h=' + reference + '&d=' + delete_code;
-    document.getElementById('delete_link').innerHTML = delete_link;
+    var delete_link_href = 'f.php?h=' + reference + '&d=' + delete_code;
     document.getElementById('delete_link').href = delete_link_href;
 
     // Validity date
@@ -168,11 +163,9 @@ function show_link (url, reference, delete_code, crypt_key, date)
     if (!!document.getElementById('preview_link'))
     {
         document.getElementById('upload_finished_preview').style.display = 'none';
-        var preview_link = url + 'f.php?h=' + reference + '&amp;p=1';
-        var preview_link_href = url + 'f.php?h=' + reference + '&p=1';
+        var preview_link_href = 'f.php?h=' + reference + '&p=1';
         if (crypt_key.length > 0)
         {
-            preview_link += '&amp;k=' + crypt_key;
             preview_link_href += '&k=' + crypt_key;
         }
 
@@ -183,24 +176,19 @@ function show_link (url, reference, delete_code, crypt_key, date)
              type.indexOf("text") > -1 ||
              type.indexOf("video") > -1)
          {
-            document.getElementById('preview_link').innerHTML = preview_link;
             document.getElementById('preview_link').href = preview_link_href;
             document.getElementById('upload_finished_preview').style.display = '';
          }
     }
 
     // Direct download link
-    var direct_download_link = url + 'f.php?h=' + reference + '&amp;d=1';
-    var direct_download_link_href = url + 'f.php?h=' + reference + '&d=1';
+    var direct_download_link_href = 'f.php?h=' + reference + '&d=1';
     if (crypt_key.length > 0)
     {
-        direct_download_link += '&amp;k=' + crypt_key;
         direct_download_link_href += '&k=' + crypt_key;
     }
-    document.getElementById('direct_link').innerHTML = direct_download_link;
     document.getElementById('direct_link').href = direct_download_link_href;
 
-
     // Hide preview and direct download link if password is set
     if (document.getElementById('input_key').value.length > 0)
     {
@@ -330,7 +318,7 @@ function add_time_string_to_date(d, time)
     return false;
 }
 
-function classic_upload (url, file, time, password, one_time, upload_password)
+function classic_upload (file, time, password, one_time, upload_password)
 {
     // Delay time estimation init as we can't have file size
     upload_time_estimation_init(0);
@@ -366,10 +354,10 @@ function classic_upload (url, file, time, password, one_time, upload_password)
                 expiryDate = localDatetime;
             }
 
-            show_link (url, res[0], res[1], res[2], expiryDate);
+            show_link (res[0], res[1], res[2], expiryDate);
         }
     }
-    req.open ("POST", url + 'script.php' , true);
+    req.open ("POST", 'script.php' , true);
 
     var form = new FormData();
     form.append ("file", file);
@@ -391,17 +379,15 @@ function check_html5_file_api ()
 }
 
 var async_global_transfered = 0;
-var async_global_url = '';
 var async_global_file;
 var async_global_ref = '';
 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, upload_password)
+function async_upload_start (max_size, file, time, password, one_time, upload_password)
 {
     async_global_transfered = 0;
-    async_global_url = url;
     async_global_file = file;
     async_global_max_size = max_size;
     async_global_time = time;
@@ -427,7 +413,7 @@ function async_upload_start (url, max_size, file, time, password, one_time, uplo
             async_upload_push (code);
         }
     }
-    req.open ("POST", async_global_url + 'script.php?init_async' , true);
+    req.open ("POST", 'script.php?init_async' , true);
 
     var form = new FormData();
     form.append ("filename", async_global_file.name);
@@ -498,7 +484,7 @@ function async_upload_push (code)
             async_upload_push (code);
         }
     }
-    req.open ("POST", async_global_url + '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;
@@ -545,10 +531,10 @@ function async_upload_end (code)
               expiryDate = localDatetime;
             }
 
-            show_link (async_global_url, res[0], res[1], res[2], expiryDate);
+            show_link (res[0], res[1], res[2], expiryDate);
         }
     }
-    req.open ("POST", async_global_url + 'script.php?end_async' , true);
+    req.open ("POST", 'script.php?end_async' , true);
 
     var form = new FormData();
     form.append ("ref", async_global_ref);
@@ -556,12 +542,12 @@ function async_upload_end (code)
     req.send (form);
 }
 
-function upload (url, max_size)
+function upload (max_size)
 {
     if (check_html5_file_api ()
         && document.getElementById('file_select').files[0].size >= max_size)
     {
-        async_upload_start (url,
+        async_upload_start (
             max_size,
             document.getElementById('file_select').files[0],
             document.getElementById('select_time').value,
@@ -572,7 +558,7 @@ function upload (url, max_size)
     }
     else
     {
-        classic_upload (url,
+        classic_upload (
             document.getElementById('file_select').files[0],
             document.getElementById('select_time').value,
             document.getElementById('input_key').value,

diff --git a/lib/functions.php b/lib/functions.php
index 7d15e1b620267e521d59953db063a194f31814c3..0bb51db1d841c53bcbee4572957969118947df55 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -609,7 +609,7 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                 /* Print link informations. */
                 echo '<tr>';
                 echo '<td>' .
-                '<strong><a id="upload_link" href="' . JIRAFEAU_ABSPREFIX . 'f.php?h='. htmlspecialchars($node) .'" title="' .
+                '<strong><a id="upload_link" href="f.php?h='. htmlspecialchars($node) .'" title="' .
                     t('Download page') . '">' . htmlspecialchars($l['file_name']) . '</a></strong>';
                 echo '</td>';
                 echo '<td>' . $l['mime_type'] . '</td>';

diff --git a/lib/template/footer.php b/lib/template/footer.php
index f33373f3f688532467f288352a8ef41ff51c8445..054f97fa23922af0fc89bdd34ff7288d0d1f9f0e 100644 (file)
--- a/lib/template/footer.php
+++ b/lib/template/footer.php
@@ -11,7 +11,7 @@
         <?php
         if (false === empty($cfg['installation_done'])) {
             echo ' <span>|</span> ';
-            echo '<a href="' . JIRAFEAU_ABSPREFIX . 'tos.php">' . t('Terms of Service') . '</a>';
+            echo '<a href="tos.php">' . t('Terms of Service') . '</a>';
         }
         ?>
     </p>

diff --git a/lib/template/header.php b/lib/template/header.php
index f03b2bacbbb925091f92b30496e920b984e573b9..fa7fb8f59ab3c702f764fd28eb893d25d5449c77 100644 (file)
--- a/lib/template/header.php
+++ b/lib/template/header.php
@@ -7,14 +7,14 @@ header('x-ua-compatible: ie=edge');
 <head>
   <meta charset="utf-8">
   <title><?php echo (true === empty($cfg['title']))? t('Jirafeau, your web file repository') : $cfg['title']; ?></title>
-  <link rel="shortcut icon" href="<?php echo JIRAFEAU_ABSPREFIX . 'media/' . $cfg['style'] . '/favicon.ico'; ?>">
-  <link href="<?php echo JIRAFEAU_ABSPREFIX . 'media/' . $cfg['style'] . '/style.css.php'; ?>" rel="stylesheet" type="text/css" />
+  <link rel="shortcut icon" href="<?php echo 'media/' . $cfg['style'] . '/favicon.ico'; ?>">
+  <link href="<?php echo 'media/' . $cfg['style'] . '/style.css.php'; ?>" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<script type="text/javascript" src="<?php echo JIRAFEAU_ABSPREFIX . 'lib/functions.js.php'; ?>"></script>
+<script type="text/javascript" src="<?php echo 'lib/functions.js.php'; ?>"></script>
 <div id="content">
   <h1>
-    <a href="<?php echo JIRAFEAU_ABSPREFIX; ?>">
+    <a href="./">
       <?php echo (true === empty($cfg['title']))? t('Jirafeau, your web file repository') : $cfg['title']; ?>
     </a>
   </h1>

diff --git a/script.php b/script.php
index f00b1df23b347d63a339668879bb3e0ec0c05d0b..ffd2c0ea085546e662a815b1b3028e2483581aa8 100644 (file)
--- a/script.php
+++ b/script.php
@@ -50,7 +50,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count($_GET) == 0) {
     <h2>Scripting interface</h2>
     <p>This interface permits to script your uploads and downloads.</p>
     <p>See <a href="https://gitlab.com/mojo42/Jirafeau/blob/master/script.php">source code</a> of this interface to get available calls :)</p>
-    <p>You may download a preconfigured <a href="<?php echo JIRAFEAU_ABSPREFIX . 'script.php?lang=bash'; ?>">Bash Script</a> to easily send to and get files from the API via command line.</p>
+    <p>You may download a preconfigured <a href="script.php?lang=bash">Bash Script</a> to easily send to and get files from the API via command line.</p>
     </div>
     <br />
     <?php