Jirafeau 4.7.2 is ready

[jirafeau/jirafeau.git] / script.php

diff --git a/script.php b/script.php
index 5f3bc6f359996bd866a89a5b410b9fd8921b05e2..301ebe8cb088e83e6d9774bdc852d36811e10c68 100644 (file)
--- a/script.php
+++ b/script.php
@@ -74,7 +74,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
             !jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
             echo 'Error 3: Invalid password';
             exit;
-        } elseif (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) {
+        } elseif (!isset($_POST['upload_password']) && !jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) {
             echo 'Error 2: No password nor allowed IP';
             exit;
         }
@@ -183,7 +183,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
         echo 'Error 9';
         exit;
     }
-    if (strlen($link['key']) > 0 && md5($key) != $link['key']) {
+    if (strlen($link['key']) > 0 && hash('sha256', $key) != $link['key']) {
         sleep(2);
         echo 'Error 10';
         exit;
@@ -320,7 +320,7 @@ downloadpage='f.php'
 
 if [ "$1" == "send" ]; then
     if [ ! -f "$2" ]; then
-        echo "File \"$2\" does not exists."
+        echo "File \"$2\" does not exist."
         exit
     fi