X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/d240b793e591628b46a2fab01643a44da1abdb2c..8d598fa5dd872010dbe2ea0179cd98a745db3dd0:/index.php

diff --git a/index.php b/index.php
index 795c804..9edb3af 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2013
- *  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Jerome Jutteau <jerome@jutteau.fr>
  *  Jimmy Beauvois <jimmy.beauvois@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -18,6 +18,7 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+session_start();
 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
 require(JIRAFEAU_ROOT . 'lib/settings.php');
@@ -34,12 +35,16 @@ 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_without_password($cfg, 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, get_ip_address($cfg))) {
     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {
-        session_start();
-
         // Logout action
         if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
             session_unset();
@@ -53,7 +58,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;
-                jirafeau_fatal_error(t('Wrong password.'), $cfg);
+                jirafeau_fatal_error(t('BAD_PSW'), $cfg);
             }
         }
 
@@ -65,18 +70,18 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg
                 <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"
                     name = "upload_password" id = "upload_password"
-                    size = "40" />
+                    size = "40" autocomplete = "current-password" />
                     </td>
                 </tr>
                 <tr class = "nav">
                     <td class = "nav next">
                     <input type = "submit" name = "key" value =
-                    "<?php echo t('Login'); ?>" />
+                    "<?php echo t('LOGIN'); ?>" />
                     </td>
                 </tr>
                 </table>
@@ -87,20 +92,21 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg
             exit;
         }
     }
-}
-else {
-    jirafeau_fatal_error(t('Access denied'), $cfg);
+} else {
+    jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
 }
 
 ?>
 <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>
-        <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>
-        <button id="upload_link_button">✂</button>
+    </p><p>
+        <code id=upload_link_text></code>
+        <button id="upload_link_button">&#128203;</button>
     </p>
     </div>
 
@@ -108,8 +114,10 @@ else {
     ?>
     <div id="upload_finished_preview">
     <p>
-        <a id="preview_link" href=""><?php echo t('View link') ?></a>
-        <button id="preview_link_button">✂</button>
+        <a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>
+    </p><p>
+        <code id=preview_link_text></code>
+        <button id="preview_link_button">&#128203;</button>
     </p>
     </div>
     <?php
@@ -117,27 +125,31 @@ else {
 
     <div id="upload_direct_download">
     <p>
-        <a id="direct_link" href=""><?php echo t('Direct download link') ?></a>
-        <button id="direct_link_button">✂</button>
+        <a id="direct_link" href=""><?php echo t('DIRECT_DL') ?></a>
+    </p><p>
+        <code id=direct_link_text></code>
+        <button id="direct_link_button">&#128203;</button>
     </p>
     </div>
 
     <div id="upload_delete">
     <p>
-        <a id="delete_link" href=""><?php echo t('Delete link') ?></a>
-        <button id="delete_link_button">✂</button>
+        <a id="delete_link" href=""><?php echo t('DELETE_LINK') ?></a>
+    </p><p>
+        <code id=delete_link_text></code>
+        <button id="delete_link_button">&#128203;</button>
     </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>
-    <?php echo t('Uploading ...'); ?>
+    <?php echo t('UP'); ?>
     <div id="uploaded_percentage"></div>
     <div id="uploaded_speed"></div>
     <div id="uploaded_time"></div>
@@ -150,59 +162,71 @@ else {
 <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"
-    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"; ?>')"/>
+        <input type="file" id="file_select" size="30"
+    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php
+        if ($cfg['maximal_upload_size'] >= 1024) {
+            echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size']/1024, 2) . " GB.";
+        } elseif ($cfg['maximal_upload_size'] > 0) {
+            echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
+        }
+    ?>')"/>
     </p>
 
     <div id="options">
         <table id="option_table">
+        <?php
+        if ($cfg['one_time_download']) {
+            echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
+            echo '<td><input type="checkbox" id="one_time_download" /></td></tr>';
+        }
+        ?>
         <tr>
-        <td><?php echo t('One time download'); ?>:</td>
-        <td><input type="checkbox" id="one_time_download" /></td>
-        </tr>
-        <tr>
-        <td><label for="input_key"><?php echo t('Password') . ':'; ?></label></td>
-        <td><input type="text" name="key" id="input_key" /></td>
+        <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>
+        <td><input type="password" name="key" id="input_key" autocomplete = "new-password"/></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',
-            'label' => 'One minute'
+            'label' => '1_MIN'
           ),
           array(
             'value' => 'hour',
-            'label' => 'One hour'
+            'label' => '1_H'
           ),
           array(
             'value' => 'day',
-            'label' => 'One day'
+            'label' => '1_D'
           ),
           array(
             'value' => 'week',
-            'label' => 'One week'
+            'label' => '1_W'
+          ),
+          array(
+              'value' => 'fortnight',
+              'label' => '2_W'
           ),
           array(
             'value' => 'month',
-            'label' => 'One month'
+            'label' => '1_M'
           ),
           array(
             'value' => 'quarter',
-            'label' => 'One quarter'
+            'label' => '1_Q'
           ),
           array(
             'value' => 'year',
-            'label' => 'One year'
+            'label' => '1_Y'
           ),
           array(
             'value' => 'none',
-            'label' => 'None'
+            'label' => 'NONE'
           )
         );
         foreach ($expirationTimeOptions as $expirationTimeOption) {
@@ -217,28 +241,31 @@ else {
         </tr>
 
         <?php
-        if ($cfg['maximal_upload_size'] > 0) {
-            echo '<p class="config">' . t('File size is limited to');
-            echo " " . $cfg['maximal_upload_size'] . " MB</p>";
+        if ($cfg['maximal_upload_size'] >= 1024) {
+            echo '<p class="config">' . t('FILE_LIM');
+            echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</p>";
+        } elseif ($cfg['maximal_upload_size'] > 0) {
+            echo '<p class="config">' . t('FILE_LIM');
+            echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
+        } else {
+            echo '<p class="config"></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']) {
         ?>
     <input type="hidden" id="upload_password" name="upload_password" value="<?php echo $_SESSION['user_upload_password'] ?>"/>
     <?php
-
     } else {
         ?>
     <input type="hidden" id="upload_password" name="upload_password" value=""/>
     <?php
-
     }
     ?>
-    <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 = '';
@@ -249,20 +276,21 @@ else {
     </div> </fieldset>
 
     <?php
-    if (jirafeau_has_upload_password($cfg)) {
+    if (jirafeau_has_upload_password($cfg)
+        && false === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
         ?>
     <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
-
     }
     ?>
 
 </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';
@@ -270,12 +298,13 @@ else {
     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');
+// @license-end
 </script>
 <?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>