X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/d5b85f9c7bda15446c271edf809c4dde150f6f3d..31ff867136044d3f3fbeb4357f814adb8da3003a:/script.php

diff --git a/script.php b/script.php
index 90b2c11..5fe60e2 100644
--- a/script.php
+++ b/script.php
@@ -81,7 +81,6 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
             exit;
         }
     }
-    
     $key = '';
     if (isset($_POST['key'])) {
         $key = $_POST['key'];
@@ -128,9 +127,10 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     }
 
     $res = jirafeau_upload($_FILES['file'],
-                            isset($_POST['one_time_download']),
-                            $key, $time, get_ip_address($cfg),
-                            $cfg['enable_crypt'], $cfg['link_name_length']);
+                           isset($_POST['one_time_download']),
+                           $key, $time, get_ip_address($cfg),
+                           $cfg['enable_crypt'], $cfg['link_name_length'],
+                           $cfg['file_hash']);
 
     if (empty($res) || $res['error']['has_error']) {
         echo 'Error 6 ' . $res['error']['why'];
@@ -180,8 +180,8 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
         echo 'Error 10';
         exit;
     }
-    $p = s2p($link['md5']);
-    if (!file_exists(VAR_FILES . $p . $link['md5'])) {
+    $p = s2p($link['hash']);
+    if (!file_exists(VAR_FILES . $p . $link['hash'])) {
         echo 'Error 11';
         exit;
     }
@@ -192,7 +192,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     header('Content-Disposition: attachment; filename="' .
             $link['file_name'] . '"');
 
-    $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();
@@ -204,8 +204,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     }
     exit;
 } elseif (isset($_GET['get_capacity'])) {
-    echo min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
-              jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
+    echo jirafeau_get_max_upload_size_bytes();
 } elseif (isset($_GET['get_maximal_upload_size'])) {
     echo $cfg['maximal_upload_size'];
 } elseif (isset($_GET['get_version'])) {
@@ -468,7 +467,7 @@ elseif (isset($_GET['end_async'])) {
         || !isset($_POST['code'])) {
         echo 'Error 24';
     } else {
-        echo jirafeau_async_end($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
+        echo jirafeau_async_end($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length'], $cfg['file_hash']);
     }
 } else {
     echo 'Error 25';