[BUGFIX] fix broken password auth and deny access

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index 6d1dc10afeb99d51644376f5a2f7f9250052e5d0..7c24e3bb7b7103b9e5ef0ee401c1dca463ff7cf6 100644 (file)
--- 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. */
 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)) {
 
     /* 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;
         }
             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">
 
 ?>
 <div id="upload_finished">