[BUGFIX] remove auto-generated FIX ME in config.local.php file

[jirafeau_mojo42.git] / f.php

diff --git a/f.php b/f.php
index 5fd85759782dcd8a0839cfe8b8358169b2c6e6bd..d61caebf7ef0db0cf51cfa1792113f833e9ff3a8 100644 (file)
--- a/f.php
+++ b/f.php
@@ -2,7 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>

- *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>

  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as


@@ -73,8 +73,8 @@ if (isset($_GET['p']) && !empty($_GET['p'])) {
     $do_preview = true;
 }
 
     $do_preview = true;
 }
 

-$p = s2p($link['md5']);
-if (!file_exists(VAR_FILES . $p . $link['md5'])) {
+$p = s2p($link['hash']);
+if (!file_exists(VAR_FILES . $p . $link['hash'])) {

     jirafeau_delete_link($link_name);
     require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>'.t('FILE_NOT_AVAIL').
     jirafeau_delete_link($link_name);
     require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>'.t('FILE_NOT_AVAIL').


@@ -97,10 +97,10 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
              <legend> <?php echo t('CONFIRM_DEL') ?> </legend>
              <table>
              <tr><td>
              <legend> <?php echo t('CONFIRM_DEL') ?> </legend>
              <table>
              <tr><td>

-             <?php echo t('GONNA_DEL') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
+             <?php echo t('GONNA_DEL') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>

              </td></tr>
              <tr><td>
              </td></tr>
              <tr><td>

-                <?php echo t('USING_SERIVCE'). ' <a href="tos.php">' . t('TOS') . '</a>.' ?>
+                <?php echo t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' ?>

              </td></tr>
              <tr><td>
                 <input type="submit" id="submit_delete"  value="<?php echo t('DELETE'); ?>"
              </td></tr>
              <tr><td>
                 <input type="submit" id="submit_delete"  value="<?php echo t('DELETE'); ?>"


@@ -147,7 +147,7 @@ if (!empty($link['key'])) {
              '<input type = "password" name = "key" />' .
              '</td></tr>' .
              '<tr><td>' .
              '<input type = "password" name = "key" />' .
              '</td></tr>' .
              '<tr><td>' .

-             t('USING_SERIVCE'). ' <a href="tos.php">' . t('TOS') . '</a>.' .
+             t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .

              '</td></tr>';
 
         if ($link['onetime'] == 'O') {
              '</td></tr>';
 
         if ($link['onetime'] == 'O') {


@@ -193,12 +193,12 @@ if (!$password_challenged && !$do_download && !$do_preview) {
     echo '<div>' .
              '<form action="f.php" method="post" id="submit_post" class="form download">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
     echo '<div>' .
              '<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>' .
+        echo '<fieldset><legend>' . jirafeau_escape($link['file_name']) . '</legend><table>' .

              '<tr><td>' .
              '<tr><td>' .

-             t('NOW_DOWNLOADING') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
+             t('NOW_DOWNLOADING') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .

              '</td></tr>' .
              '<tr><td>' .
              '</td></tr>' .
              '<tr><td>' .

-             t('USING_SERIVCE'). ' <a href="tos.php">' . t('TOS') . '</a>.' .
+             t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .

              '</td></tr>';
 
     if ($link['onetime'] == 'O') {
              '</td></tr>';
 
     if ($link['onetime'] == 'O') {


@@ -238,19 +238,33 @@ if (!jirafeau_is_viewable($link['mime_type']) || !$cfg['preview'] || $do_downloa
     header('Content-Disposition: filename="' . $link['file_name'] . '"');
 }
 header('Content-Type: ' . $link['mime_type']);
     header('Content-Disposition: filename="' . $link['file_name'] . '"');
 }
 header('Content-Type: ' . $link['mime_type']);

-header('Content-MD5: ' . hex_to_base64($link['md5']));
-
+if ($cfg['file_hash'] == "md5") {
+    header('Content-MD5: ' . hex_to_base64($link['hash']));
+}
+if ($cfg['litespeed_workaround']) {
+    // Work around that LiteSpeed truncates large files.
+    // See https://www.litespeedtech.com/support/wiki/doku.php/litespeed_wiki:config:internal-redirect
+    if ($_GET['litespeed_workaround'] == 'phase2') {
+        $file_web_path = preg_replace('#^' . $_SERVER['DOCUMENT_ROOT'] . '#', '', VAR_FILES);
+        header('X-LiteSpeed-Location: ' . $file_web_path . $p . $link['hash']);
+    } else {
+        // Since Content-Type isn't forwarded by LiteSpeed, first
+        // redirect to the same URL but append the file name.
+        header('Location: ' . $_SERVER['PHP_SELF'] . '/' . $link['file_name'] . '?' .
+               $_SERVER['QUERY_STRING'] . '&litespeed_workaround=phase2');
+    }
+}

 /* Read encrypted file. */
 /* Read encrypted file. */

-if ($link['crypted']) {
+else if ($link['crypted']) {

     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */

-    $md5_key = md5($crypt_key);
-    $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
+    $hash_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));

     /* Init module. */
     /* Init module. */

-    mcrypt_generic_init($m, $md5_key, $iv);
+    mcrypt_generic_init($m, $hash_key, $iv);

     /* Decrypt file. */
     /* Decrypt file. */

-    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');

     while (!feof($r)) {
         $dec = mdecrypt_generic($m, fread($r, 1024));
         print $dec;
     while (!feof($r)) {
         $dec = mdecrypt_generic($m, fread($r, 1024));
         print $dec;


@@ -263,7 +277,7 @@ if ($link['crypted']) {
 }
 /* Read file. */
 else {
 }
 /* Read file. */
 else {

-    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');

     while (!feof($r)) {
         print fread($r, 1024);
         ob_flush();
     while (!feof($r)) {
         print fread($r, 1024);
         ob_flush();