Small changes to README and CONTRIBUTING

[jirafeau.git] / f.php

diff --git a/f.php b/f.php
index 8f7aa37d48765060b406307cd9ae6ecdecd64105..543fc1028cfb33371a009c49d111652c2f52c7c5 100644 (file)
--- a/f.php
+++ b/f.php
@@ -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>';


@@ -254,38 +248,34 @@ if ($cfg['litespeed_workaround']) {
                $_SERVER['QUERY_STRING'] . '&litespeed_workaround=phase2');
     }
 }
                $_SERVER['QUERY_STRING'] . '&litespeed_workaround=phase2');
     }
 }

-/* Read encrypted file. */
-else if ($link['crypted']) {
-    /* Init module */
-    $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
-    /* Extract key and iv. */
-    $hash_key = md5($crypt_key);
-    $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
-    /* Init module. */
-    mcrypt_generic_init($m, $hash_key, $iv);
-    /* Decrypt file. */
-    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
-    while (!feof($r)) {
-        $dec = mdecrypt_generic($m, fread($r, 1024));
-        print $dec;
-    }
-    fclose($r);
-    /* Cleanup. */
-    mcrypt_generic_deinit($m);
-    mcrypt_module_close($m);
+/* Read encrypted file (Sodium mode). */
+elseif ($link['crypted']) {
+    jirafeau_decrypt_file(VAR_FILES . $p . $link['hash'], 'php://output', $crypt_key);
+}
+/* Read encrypted file (legacy mode using mcrypt). */
+elseif ($link['crypted_legacy']) {
+    jirafeau_decrypt_file_legacy(VAR_FILES . $p . $link['hash'], 'php://output', $crypt_key);

 }
 /* Read file. */
 else {
 }
 /* Read file. */
 else {

-    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
-    while (!feof($r)) {
-        print fread($r, 1024);
+    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') {
     jirafeau_delete_link($link_name);
 }
 }
 
 if ($link['onetime'] == 'O') {
     jirafeau_delete_link($link_name);
 }

+
+jirafeau_write_download_stats($link_name, get_ip_address($cfg));
+

 exit;
 
 ?>
 exit;
 
 ?>