From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Tue, 12 Aug 2025 12:46:59 +0000 (+0200)
Subject: Merge branch 'f_issue_35-36' into 'next-release'
X-Git-Tag: 4.7.0~6
X-Git-Url: https://git.p6c8.net/jirafeau/pcanterino.git/commitdiff_plain/3c708cc1e3834dc936e2480261aec9ad56f66a48?hp=51a3e59006cc2dbe80a20ea9a5031795249bb914

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 aa8c259..ae57449 100644
--- 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;
         }