[FEATURE] Add check ip_nopassword in challenge_upload function

[jirafeau.git] / index.php

diff --git a/index.php b/index.php
index bb454afe141aa1d60472e6776bdfbf470499c0be..e860012d42601d6bb90e385db882ede171524ea6 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. */
 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
     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {
         // Logout action


@@ -52,7 +55,7 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg
                 $_SESSION['user_upload_password'] = $_POST['upload_password'];
             } else {
                 $_SESSION['admin_auth'] = false;
                 $_SESSION['user_upload_password'] = $_POST['upload_password'];
             } else {
                 $_SESSION['admin_auth'] = false;

-                jirafeau_fatal_error(t('Wrong password.'), $cfg);
+                jirafeau_fatal_error(t('BAD_PSW'), $cfg);

             }
         }
 
             }
         }
 


@@ -64,7 +67,7 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg
                 <table>
                 <tr>
                     <td class = "label"><label for = "enter_password">
                 <table>
                 <tr>
                     <td class = "label"><label for = "enter_password">

-                    <?php echo t('Upload password') . ':'; ?></label>
+                    <?php echo t('UP_PSW') . ':'; ?></label>

                     </td>
                 </tr><tr>
                     <td class = "field"><input type = "password"
                     </td>
                 </tr><tr>
                     <td class = "field"><input type = "password"


@@ -75,7 +78,7 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg
                 <tr class = "nav">
                     <td class = "nav next">
                     <input type = "submit" name = "key" value =
                 <tr class = "nav">
                     <td class = "nav next">
                     <input type = "submit" name = "key" value =

-                    "<?php echo t('Login'); ?>" />
+                    "<?php echo t('LOGIN'); ?>" />

                     </td>
                 </tr>
                 </table>
                     </td>
                 </tr>
                 </table>


@@ -88,20 +91,20 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg
     }
 }
 else {
     }
 }
 else {

-    jirafeau_fatal_error(t('Access denied'), $cfg);
+    jirafeau_fatal_error(t('ACCESS_KO'), $cfg);

 }
 
 ?>
 <div id="upload_finished">
 }
 
 ?>
 <div id="upload_finished">

-    <p><?php echo t('File uploaded !') ?></p>
+    <p><?php echo t('FILE_UP') ?></p>

 
     <div id="upload_finished_download_page">
     <p>
 
     <div id="upload_finished_download_page">
     <p>

-        <a id="upload_link" href=""><?php echo t('Download page') ?></a>
+        <a id="upload_link" href=""><?php echo t('DL_PAGE') ?></a>

         <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
     </p><p>
         <code id=upload_link_text></code>
         <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>
 
     </p>
     </div>
 


@@ -109,10 +112,10 @@ else {
     ?>
     <div id="upload_finished_preview">
     <p>
     ?>
     <div id="upload_finished_preview">
     <p>

-        <a id="preview_link" href=""><?php echo t('View link') ?></a>
+        <a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>

     </p><p>
         <code id=preview_link_text></code>
     </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
     </p>
     </div>
     <?php


@@ -120,31 +123,31 @@ else {
 
     <div id="upload_direct_download">
     <p>
 
     <div id="upload_direct_download">
     <p>

-        <a id="direct_link" href=""><?php echo t('Direct download link') ?></a>
+        <a id="direct_link" href=""><?php echo t('DIRECT_DL') ?></a>

     </p><p>
         <code id=direct_link_text></code>
     </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>
 
     <div id="upload_delete">
     <p>
     </p>
     </div>
 
     <div id="upload_delete">
     <p>

-        <a id="delete_link" href=""><?php echo t('Delete link') ?></a>
+        <a id="delete_link" href=""><?php echo t('DELETE_LINK') ?></a>

     </p><p>
         <code id=delete_link_text></code>
     </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>
 
     <div id="upload_validity">
     </p>
     </div>
 
     <div id="upload_validity">

-    <p><?php echo t('This file is valid until the following date'); ?>:</p>
+    <p><?php echo t('VALID_UNTIL'); ?>:</p>

     <p id="date"></p>
     </div>
 </div>
 
 <div id="uploading">
     <p>
     <p id="date"></p>
     </div>
 </div>
 
 <div id="uploading">
     <p>

-    <?php echo t('Uploading ...'); ?>
+    <?php echo t('UP'); ?>

     <div id="uploaded_percentage"></div>
     <div id="uploaded_speed"></div>
     <div id="uploaded_time"></div>
     <div id="uploaded_percentage"></div>
     <div id="uploaded_speed"></div>
     <div id="uploaded_time"></div>


@@ -157,59 +160,59 @@ else {
 <div id="upload">
 <fieldset>
     <legend>
 <div id="upload">
 <fieldset>
     <legend>

-    <?php echo t('Select a file'); ?>
+    <?php echo t('SEL_FILE'); ?>

     </legend>
     <p>
     <input type="file" id="file_select" size="30"
     </legend>
     <p>
     <input type="file" id="file_select" size="30"

-    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t('File is too big') . ', ' . t('File size is limited to') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/>
+    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/>

     </p>
 
     <div id="options">
         <table id="option_table">
         <tr>
     </p>
 
     <div id="options">
         <table id="option_table">
         <tr>

-        <td><?php echo t('One time download'); ?>:</td>
+        <td><?php echo t('ONE_TIME_DL'); ?>:</td>

         <td><input type="checkbox" id="one_time_download" /></td>
         </tr>
         <tr>
         <td><input type="checkbox" id="one_time_download" /></td>
         </tr>
         <tr>

-        <td><label for="input_key"><?php echo t('Password') . ':'; ?></label></td>
+        <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>

         <td><input type="text" name="key" id="input_key" /></td>
         </tr>
         <tr>
         <td><input type="text" name="key" id="input_key" /></td>
         </tr>
         <tr>

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

         <td><select name="time" id="select_time">
         <?php
         $expirationTimeOptions = array(
           array(
             'value' => 'minute',
         <td><select name="time" id="select_time">
         <?php
         $expirationTimeOptions = array(
           array(
             'value' => 'minute',

-            'label' => 'One minute'
+            'label' => '1_MIN'

           ),
           array(
             'value' => 'hour',
           ),
           array(
             'value' => 'hour',

-            'label' => 'One hour'
+            'label' => '1_H'

           ),
           array(
             'value' => 'day',
           ),
           array(
             'value' => 'day',

-            'label' => 'One day'
+            'label' => '1_D'

           ),
           array(
             'value' => 'week',
           ),
           array(
             'value' => 'week',

-            'label' => 'One week'
+            'label' => '1_W'

           ),
           array(
             'value' => 'month',
           ),
           array(
             'value' => 'month',

-            'label' => 'One month'
+            'label' => '1_M'

           ),
           array(
             'value' => 'quarter',
           ),
           array(
             'value' => 'quarter',

-            'label' => 'One quarter'
+            'label' => '1_Q'

           ),
           array(
             'value' => 'year',
           ),
           array(
             'value' => 'year',

-            'label' => 'One year'
+            'label' => '1_Y'

           ),
           array(
             'value' => 'none',
           ),
           array(
             'value' => 'none',

-            'label' => 'None'
+            'label' => 'NONE'

           )
         );
         foreach ($expirationTimeOptions as $expirationTimeOption) {
           )
         );
         foreach ($expirationTimeOptions as $expirationTimeOption) {


@@ -225,12 +228,12 @@ else {
 
         <?php
         if ($cfg['maximal_upload_size'] > 0) {
 
         <?php
         if ($cfg['maximal_upload_size'] > 0) {

-            echo '<p class="config">' . t('File size is limited to');
+            echo '<p class="config">' . t('FILE_LIM');

             echo " " . $cfg['maximal_upload_size'] . " MB</p>";
         }
         ?>
 
             echo " " . $cfg['maximal_upload_size'] . " MB</p>";
         }
         ?>
 

-               <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']) {
     <p>
     <?php
     if (jirafeau_has_upload_password($cfg) && $_SESSION['upload_auth']) {


@@ -245,7 +248,7 @@ else {
 
     }
     ?>
 
     }
     ?>

-    <input type="submit" id="send" value="<?php echo t('Send'); ?>"
+    <input type="submit" id="send" value="<?php echo t('SEND'); ?>"

     onclick="
         document.getElementById('upload').style.display = 'none';
         document.getElementById('uploading').style.display = '';
     onclick="
         document.getElementById('upload').style.display = 'none';
         document.getElementById('uploading').style.display = '';


@@ -256,11 +259,12 @@ 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"/>

-        <input type = "submit" value = "<?php echo t('Logout'); ?>" />
+        <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />

     </form>
     <?php
 
     </form>
     <?php
 


@@ -270,6 +274,7 @@ else {
 </div>
 
 <script type="text/javascript" lang="Javascript">
 </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';
     document.getElementById('error_pop').style.display = 'none';
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload_finished').style.display = 'none';


@@ -277,12 +282,13 @@ else {
     document.getElementById('send').style.display = 'none';
     if (!check_html5_file_api ())
         document.getElementById('max_file_size').innerHTML = '<?php
     document.getElementById('send').style.display = 'none';
     if (!check_html5_file_api ())
         document.getElementById('max_file_size').innerHTML = '<?php

-             echo t('You browser may not support HTML5 so the maximum file size is ') . jirafeau_get_max_upload_size();
+             echo t('NO_BROWSER_SUPPORT') . jirafeau_get_max_upload_size();

              ?>';
 
     addCopyListener('upload_link_button', 'upload_link');
     addCopyListener('preview_link_button', 'preview_link');
     addCopyListener('direct_link_button', 'direct_link');
     addCopyListener('delete_link_button', 'delete_link');
              ?>';
 
     addCopyListener('upload_link_button', 'upload_link');
     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'); ?>
 </script>
 <?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>