[BUGFIX] fix broken password auth and deny access

[jirafeau_project.git] / index.php

diff --git a/index.php b/index.php
index 39eded554b55cff0b65e5c55e0584e1683e35d2f..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. */
-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)) {
@@ -61,7 +62,7 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
         /* Show auth page. */
         if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) {
             ?>
-            <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+            <form method="post">
             <fieldset>
                 <table>
                 <tr>
@@ -87,9 +88,13 @@ 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">
     <p><?php echo t('File uploaded !') ?></p>
@@ -108,7 +113,7 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
     <p><?php echo t('View link') ?>:</p>
     <p><a id="preview_link" href=""></a></p>
     </div>
-    <?php 
+    <?php
 } ?>
 
     <div id="upload_direct_download">
@@ -243,7 +248,7 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
     <?php
     if (jirafeau_has_upload_password($cfg)) {
         ?>
-    <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+    <form method="post">
         <input type = "hidden" name = "action" value = "logout"/>
         <input type = "submit" value = "<?php echo t('Logout'); ?>" />
     </form>