[BUGFIX] Empty admin password should not generate hash

[jirafeau_project.git] / index.php

diff --git a/index.php b/index.php
index 39eded554b55cff0b65e5c55e0584e1683e35d2f..7ce95327419494daad220e5ab207e554fa891c24 100644 (file)
--- a/index.php
+++ b/index.php
@@ -34,34 +34,33 @@ 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))) {
-
-    /* Ask password if upload password is set. */
+// First check: Challenge by IP
+if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
+    // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {
         session_start();
 
-        /* Unlog if asked. */
+        // Logout action
         if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
             session_unset();
         }
 
-        /* Auth. */
+        // Challenge by password
+        // …save successful logins in session
         if (isset($_POST['upload_password'])) {
             if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {
                 $_SESSION['upload_auth'] = true;
                 $_SESSION['user_upload_password'] = $_POST['upload_password'];
             } else {
                 $_SESSION['admin_auth'] = false;
-                echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>';
-                require(JIRAFEAU_ROOT.'lib/template/footer.php');
-                exit;
+                jirafeau_fatal_error(t('Wrong password.'), $cfg);
             }
         }
 
-        /* Show auth page. */
-        if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) {
+        // Show login form if user session is not authorized yet
+        if (true === empty($_SESSION['upload_auth'])) {
             ?>
-            <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+            <form method="post" class="form login">
             <fieldset>
                 <table>
                 <tr>
@@ -89,7 +88,10 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
         }
     }
 }
-    
+else {
+    jirafeau_fatal_error(t('Access denied'), $cfg);
+}
+
 ?>
 <div id="upload_finished">
     <p><?php echo t('File uploaded !') ?></p>
@@ -108,7 +110,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">
@@ -116,12 +118,12 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
     <p><a id="direct_link" href=""></a></p>
     </div>
 
-    <div>
+    <div id="upload_delete">
     <p><?php echo t('Delete link') ?>:</p>
     <p><a id="delete_link" href=""></a></p>
     </div>
 
-    <div id="validity">
+    <div id="upload_validity">
     <p><?php echo t('This file is valid until the following date'); ?>:</p>
     <p id="date"></p>
     </div>
@@ -243,7 +245,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" class="form logout">
         <input type = "hidden" name = "action" value = "logout"/>
         <input type = "submit" value = "<?php echo t('Logout'); ?>" />
     </form>