X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/d00ef4f1b8e503e29e10967f921c247a08670f61..d8f36ea1fdc5bcfff3f193fea7625e7c2afd49d9:/f.php?ds=inline

diff --git a/f.php b/f.php
index f7f3786..543fc10 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
@@ -250,25 +248,13 @@ if ($cfg['litespeed_workaround']) {
                $_SERVER['QUERY_STRING'] . '&litespeed_workaround=phase2');
     }
 }
-/* Read encrypted file. */
+/* Read encrypted file (Sodium mode). */
 elseif ($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);
+    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 {
@@ -287,6 +273,9 @@ else {
 if ($link['onetime'] == 'O') {
     jirafeau_delete_link($link_name);
 }
+
+jirafeau_write_download_stats($link_name, get_ip_address($cfg));
+
 exit;
 
 ?>