X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/8665ea5fc150ca65125f24023b545fe39bdb2a95..82c3971d76360b5f82e01d6e3bc0cbac3085ef1c:/f.php

diff --git a/f.php b/f.php
index e2547d7..854da83 100644
--- a/f.php
+++ b/f.php
@@ -89,8 +89,8 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
             '</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>
@@ -101,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>
-                <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
@@ -252,6 +250,30 @@ if ($cfg['litespeed_workaround']) {
 }
 /* Read encrypted file. */
 elseif ($link['crypted']) {
+    /* Decrypt file. */
+    $r = fopen(VAR_FILES . $p . $link['hash'], 'rb');
+    $fs = fstat($r)['size'];
+
+    $crypt_header = fread($r, SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES);
+
+    /* Init module. */
+    $crypt_state = sodium_crypto_secretstream_xchacha20poly1305_init_pull($crypt_header, $crypt_key);
+
+    /* Decrypt file. */
+
+    for ($i = SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES; $i < $fs; $i += JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES) {
+        $to_dec = fread($r, JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES);
+        [$dec, $crypt_tag] = sodium_crypto_secretstream_xchacha20poly1305_pull($crypt_state, $to_dec);
+        echo $dec;
+    }
+
+    fclose($r);
+
+    /* Cleanup. */
+    sodium_memzero($crypt_state);
+}
+/* Read encrypted file (legacy mode using mcrypt). */
+elseif ($link['crypted_legacy']) {
     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
@@ -272,16 +294,24 @@ elseif ($link['crypted']) {
 }
 /* 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);
 }
+
+jirafeau_write_download_stats($link_name, get_ip_address($cfg));
+
 exit;
 
 ?>