Merge branch 'f_issue_35-36' into 'next-release'

Fixes for issues 35 and 36

See merge request jirafeau/Jirafeau!26

diff --git a/script.php b/script.php
index aa8c259fe2ce6597ac0b52ec0d7ceec3aa542894..ae574494bf2165f2698c96b06b4f28773be762db 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;
         }