Centralize decryption in `jirafeau_decrypt_file()`

[jirafeau_project.git] / f.php

diff --git a/f.php b/f.php
index 5555523f708cfcb18607069e32b0ccfca9c92199..e1671545ae86a417ccf651f1d27c97a590ac3933 100644 (file)
--- a/f.php
+++ b/f.php
@@ -248,8 +248,12 @@ if ($cfg['litespeed_workaround']) {
                $_SERVER['QUERY_STRING'] . '&litespeed_workaround=phase2');
     }
 }
                $_SERVER['QUERY_STRING'] . '&litespeed_workaround=phase2');
     }
 }

-/* Read encrypted file. */
+/* Read encrypted file (Sodium mode). */

 elseif ($link['crypted']) {
 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']) {

     /* 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. */


@@ -285,6 +289,9 @@ else {
 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;
 
 ?>