From: Jerome Jutteau <j.jutteau@gmail.com>
Date: Thu, 9 Mar 2017 18:04:59 +0000 (+0000)
Subject: [BUGFIX] fix broken password auth and deny access
X-Git-Tag: 3.1.0~6
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/71e621e81a096fce132f70ee3918279cc71dd23f

[BUGFIX] fix broken password auth and deny access

ref #107
closes #111
---

diff --git a/index.php b/index.php
index 6d1dc10..7c24e3b 100644
--- a/index.php
+++ b/index.php
@@ -34,7 +34,8 @@ if (has_error()) {
 require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
 /* Check if user is allowed to upload. */
-if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
+if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) ||
+    count($cfg['upload_ip']) == 0) {
 
     /* Ask password if upload password is set. */
     if (jirafeau_has_upload_password($cfg)) {
@@ -87,8 +88,12 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
             require(JIRAFEAU_ROOT.'lib/template/footer.php');
             exit;
         }
+    } else {
+            echo '<div class="error"><p>' . t('Access denied') . '</p></div>';
+            require(JIRAFEAU_ROOT.'lib/template/footer.php');
+            exit;
     }
-}
+} 
 
 ?>
 <div id="upload_finished">