X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/33c3f08cac2785129f87e93fd754e5b872a9b3b5..208418c2e083ff46b0de2e5db64844db68112cc1:/f.php
diff --git a/f.php b/f.php
index be7ce41..9219493 100644
--- a/f.php
+++ b/f.php
@@ -73,8 +73,8 @@ if (isset($_GET['p']) && !empty($_GET['p'])) {
$do_preview = true;
}
-$p = s2p($link['md5']);
-if (!file_exists(VAR_FILES . $p . $link['md5'])) {
+$p = s2p($link['hash']);
+if (!file_exists(VAR_FILES . $p . $link['hash'])) {
jirafeau_delete_link($link_name);
require(JIRAFEAU_ROOT.'lib/template/header.php');
echo '
'.t('FILE_NOT_AVAIL').
@@ -100,7 +100,7 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
- ' . t('TOS') . '.' ?>
+ ' . t('TOS') . '.' ?>
|
' .
' |
' .
'
' .
- t('USING_SERIVCE'). ' ' . t('TOS') . '.' .
+ t('USING_SERVICE'). ' ' . t('TOS') . '.' .
' |
';
if ($link['onetime'] == 'O') {
@@ -198,7 +198,7 @@ if (!$password_challenged && !$do_download && !$do_preview) {
t('NOW_DOWNLOADING') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
'' .
'
' .
- t('USING_SERIVCE'). ' ' . t('TOS') . '.' .
+ t('USING_SERVICE'). ' ' . t('TOS') . '.' .
' |
';
if ($link['onetime'] == 'O') {
@@ -238,19 +238,21 @@ if (!jirafeau_is_viewable($link['mime_type']) || !$cfg['preview'] || $do_downloa
header('Content-Disposition: filename="' . $link['file_name'] . '"');
}
header('Content-Type: ' . $link['mime_type']);
-header('Content-MD5: ' . hex_to_base64($link['md5']));
+if ($cfg['file_hash'] == "md5") {
+ header('Content-MD5: ' . hex_to_base64($link['hash']));
+}
/* Read encrypted file. */
if ($link['crypted']) {
/* Init module */
$m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
/* Extract key and iv. */
- $md5_key = md5($crypt_key);
- $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
+ $hash_key = md5($crypt_key);
+ $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
/* Init module. */
- mcrypt_generic_init($m, $md5_key, $iv);
+ mcrypt_generic_init($m, $hash_key, $iv);
/* Decrypt file. */
- $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+ $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
while (!feof($r)) {
$dec = mdecrypt_generic($m, fread($r, 1024));
print $dec;
@@ -263,7 +265,7 @@ if ($link['crypted']) {
}
/* Read file. */
else {
- $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+ $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
while (!feof($r)) {
print fread($r, 1024);
ob_flush();