X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/41cde93bc152ccd48b5fc25d652d288a6a0af016..814a694cd2782c11983433ba053111c4743d07f3:/f.php?ds=inline
diff --git a/f.php b/f.php
index c19232d..543fc10 100644
--- a/f.php
+++ b/f.php
@@ -2,7 +2,7 @@
/*
* Jirafeau, your web file repository
* Copyright (C) 2008 Julien "axolotl" BERNARD
- * Copyright (C) 2015 Jerome Jutteau
+ * Copyright (C) 2015 Jerome Jutteau
*
* 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);
-/* Remove errors. */
-@error_reporting(0);
$link_name = $_GET['h'];
@@ -91,8 +89,8 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
'
';
} else { ?>
' . t('PSW_PROTEC') .
'';
require(JIRAFEAU_ROOT.'lib/template/footer.php');
@@ -222,7 +217,6 @@ if (!$password_challenged && !$do_download && !$do_preview) {
echo '&k=' . urlencode($crypt_key);
} ?>';
document.getElementById('submit_post').submit ();"/>';
echo '';
@@ -254,40 +248,34 @@ if ($cfg['litespeed_workaround']) {
$_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;
- ob_flush();
- }
- 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 {
- $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') {
jirafeau_delete_link($link_name);
}
+
+jirafeau_write_download_stats($link_name, get_ip_address($cfg));
+
exit;
?>