[BUGFIX] Prevent addCopyListener to add event on undefined button when preview option...

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index e4cfa20d76afc9856f3db0ad185d811f97fc02bc..c9f6cab6fe885c101a8e7d3f535c7be05f45f072 100644 (file)
--- a/index.php
+++ b/index.php
@@ -35,8 +35,11 @@ if (has_error()) {
 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))) {
+}
+// 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
@@ -101,7 +104,7 @@ else {
         <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
     </p><p>
         <code id=upload_link_text></code>
-        <button id="upload_link_button">â\9c\82</button>
+        <button id="upload_link_button">â\8e\98</button>
     </p>
     </div>
 
@@ -112,7 +115,7 @@ else {
         <a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>
     </p><p>
         <code id=preview_link_text></code>
-        <button id="preview_link_button">â\9c\82</button>
+        <button id="preview_link_button">â\8e\98</button>
     </p>
     </div>
     <?php
@@ -123,7 +126,7 @@ else {
         <a id="direct_link" href=""><?php echo t('DIRECT_DL') ?></a>
     </p><p>
         <code id=direct_link_text></code>
-        <button id="direct_link_button">â\9c\82</button>
+        <button id="direct_link_button">â\8e\98</button>
     </p>
     </div>
 
@@ -132,7 +135,7 @@ else {
         <a id="delete_link" href=""><?php echo t('DELETE_LINK') ?></a>
     </p><p>
         <code id=delete_link_text></code>
-        <button id="delete_link_button">â\9c\82</button>
+        <button id="delete_link_button">â\8e\98</button>
     </p>
     </div>
 
@@ -172,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>
@@ -230,7 +233,7 @@ else {
         }
         ?>
 
-               <p id="max_file_size" class="config"></p>
+        <p id="max_file_size" class="config"></p>
     <p>
     <?php
     if (jirafeau_has_upload_password($cfg) && $_SESSION['upload_auth']) {
@@ -256,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"/>
@@ -270,6 +274,7 @@ else {
 </div>
 
 <script type="text/javascript" lang="Javascript">
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
     document.getElementById('error_pop').style.display = 'none';
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload_finished').style.display = 'none';
@@ -284,5 +289,6 @@ else {
     addCopyListener('preview_link_button', 'preview_link');
     addCopyListener('direct_link_button', 'direct_link');
     addCopyListener('delete_link_button', 'delete_link');
+// @license-end
 </script>
 <?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>