[BUGFIX] prevent NEXT_STEP button to be disproportionnate cause of \n in ""

[jirafeau_project.git] / index.php

diff --git a/index.php b/index.php
index 54e532517f951ed84694c8d8038b18b3754db1ad..6c0a03ac2e904441bcbc4ee80f6b80cdbd9b711e 100644 (file)
--- a/index.php
+++ b/index.php
@@ -35,8 +35,14 @@ 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. */

-// First check: Challenge by IP
-if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
+// First check: Challenge by IP NO PASSWORD
+if (true === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) {
+    $_SESSION['upload_auth'] = true;
+    $_POST['upload_password'] = '';
+    $_SESSION['user_upload_password'] = $_POST['upload_password'];
+}
+// Second check: Challenge by IP
+elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {

     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {
         // Logout action
     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {
         // Logout action


@@ -172,7 +178,7 @@ else {
         </tr>
         <tr>
         <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>
         </tr>
         <tr>
         <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>

-        <td><input type="text" name="key" id="input_key" /></td>
+        <td><input type="password" name="key" id="input_key" /></td>

         </tr>
         <tr>
         <td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td>
         </tr>
         <tr>
         <td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td>


@@ -256,7 +262,8 @@ else {
     </div> </fieldset>
 
     <?php
     </div> </fieldset>
 
     <?php

-    if (jirafeau_has_upload_password($cfg)) {
+    if (jirafeau_has_upload_password($cfg)
+        && false === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) {

         ?>
     <form method="post" class="form logout">
         <input type = "hidden" name = "action" value = "logout"/>
         ?>
     <form method="post" class="form logout">
         <input type = "hidden" name = "action" value = "logout"/>