X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/6c160f220551712c82c642f45d2e70ba070c04ae..96f7e6adb9a69aa1d39a17d7332b2dcc625bd543:/index.php

diff --git a/index.php b/index.php
index 5c3ffce..c9f6cab 100644
--- a/index.php
+++ b/index.php
@@ -175,7 +175,7 @@ else {
         </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>
@@ -259,7 +259,8 @@ else {
     </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"/>