[TASK] update docker image with PHP 8.1

[jirafeau_mojo42.git] / f.php

diff --git a/f.php b/f.php
index 921949383df26b28a017c0bd1bc5e13d37f467b0..5555523f708cfcb18607069e32b0ccfca9c92199 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


@@ -32,8 +32,6 @@ if (!isset($_GET['h']) || empty($_GET['h'])) {
  * Be sure PHP's safe mode is off.
  */
 @set_time_limit(0);
  * Be sure PHP's safe mode is off.
  */
 @set_time_limit(0);

-/* Remove errors. */
-@error_reporting(0);

 
 $link_name = $_GET['h'];
 
 
 $link_name = $_GET['h'];
 


@@ -91,8 +89,8 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
             '</p></div>';
     } else { ?>
         <div>
             '</p></div>';
     } else { ?>
         <div>

-        <form action="f.php" method="post" id="submit_delete_post" class="form login">
-        <input type="hidden" name="do_delete" value=1/>
+        <form action="<?php echo 'f.php?h=' . $link_name . '&amp;d=' . $delete_code; ?>" method="post" id="submit_delete_post" class="form login">
+        <input type="hidden" name="do_delete" value="1" />

         <fieldset>
              <legend> <?php echo t('CONFIRM_DEL') ?> </legend>
              <table>
         <fieldset>
              <legend> <?php echo t('CONFIRM_DEL') ?> </legend>
              <table>


@@ -103,9 +101,7 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
                 <?php echo t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' ?>
              </td></tr>
              <tr><td>
                 <?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'); ?>"
-                onclick="document.getElementById('submit_delete_post').action='<?php echo 'f.php?h=' . $link_name . '&amp;d=' . $delete_code . "';"; ?>
-                document.getElementById('submit_delete').submit ();"/>
+                <input type="submit" id="submit_delete" value="<?php echo t('DELETE'); ?>"/>

              </td></tr>
              </table>
          </fieldset></form></div><?php
              </td></tr>
              </table>
          </fieldset></form></div><?php


@@ -144,7 +140,7 @@ if (!empty($link['key'])) {
              '<legend>' . t('PSW_PROTEC') .
              '</legend><table><tr><td>' .
              t('GIMME_PSW') . ' : ' .
              '<legend>' . t('PSW_PROTEC') .
              '</legend><table><tr><td>' .
              t('GIMME_PSW') . ' : ' .

-             '<input type = "password" name = "key" />' .
+             '<input type = "password" name = "key" autocomplete = "current-password"/>' .

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


@@ -169,7 +165,6 @@ if (!empty($link['key'])) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
             document.getElementById('submit_preview').submit ();"/><?php
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
             document.getElementById('submit_preview').submit ();"/><?php

-

         }
         echo '</td></tr></table></fieldset></form></div>';
         require(JIRAFEAU_ROOT.'lib/template/footer.php');
         }
         echo '</td></tr></table></fieldset></form></div>';
         require(JIRAFEAU_ROOT.'lib/template/footer.php');


@@ -222,7 +217,6 @@ if (!$password_challenged && !$do_download && !$do_preview) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
         document.getElementById('submit_post').submit ();"/><?php
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
         document.getElementById('submit_post').submit ();"/><?php

-

         }
     echo '</td></tr>';
     echo '</table></fieldset></form></div>';
         }
     echo '</td></tr>';
     echo '</table></fieldset></form></div>';


@@ -241,9 +235,21 @@ header('Content-Type: ' . $link['mime_type']);
 if ($cfg['file_hash'] == "md5") {
     header('Content-MD5: ' . hex_to_base64($link['hash']));
 }
 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']) {
+elseif ($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. */


@@ -256,7 +262,6 @@ if ($link['crypted']) {
     while (!feof($r)) {
         $dec = mdecrypt_generic($m, fread($r, 1024));
         print $dec;
     while (!feof($r)) {
         $dec = mdecrypt_generic($m, fread($r, 1024));
         print $dec;

-        ob_flush();

     }
     fclose($r);
     /* Cleanup. */
     }
     fclose($r);
     /* Cleanup. */


@@ -265,12 +270,16 @@ if ($link['crypted']) {
 }
 /* Read file. */
 else {
 }
 /* Read file. */
 else {

-    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
-    while (!feof($r)) {
-        print fread($r, 1024);
-        ob_flush();
+    if ($cfg['use_xsendfile']) {
+        $file_web_path = preg_replace('#^' . $_SERVER['DOCUMENT_ROOT'] . '#', '', VAR_FILES);
+        header('X-Sendfile: ' . $file_web_path . $p . $link['hash']);
+    } else {
+        $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
+        while (!feof($r)) {
+            print fread($r, 1024);
+        }
+        fclose($r);

     }
     }

-    fclose($r);

 }
 
 if ($link['onetime'] == 'O') {
 }
 
 if ($link['onetime'] == 'O') {