X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/18a49e2771e57b65b70ac684912295450ebb283b..17d5977bf8d24a1b0abb5f52a8453322f21a994d:/index.php?ds=sidebyside

diff --git a/index.php b/index.php
index 9b1a4c9..b6dac09 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
@@ -27,43 +27,42 @@ require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 check_errors($cfg);
 if (has_error()) {
+    require(JIRAFEAU_ROOT . 'lib/template/header.php');
     show_errors();
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
-
 require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
+// Logout action
+if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+    jirafeau_session_end();
+}
+
 /* Check if user is allowed to upload. */
-// 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'];
+// First check: Is user already logged
+if (jirafeau_user_session_logged()) {
 }
-// Second check: Challenge by IP
-elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
+// Second check: Challenge by IP NO PASSWORD
+elseif (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
+    jirafeau_user_session_start();
+}
+// Third 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)) {
-        // Logout action
-        if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
-            session_unset();
-        }
-
         // Challenge by password
-        // …save successful logins in session
         if (isset($_POST['upload_password'])) {
             if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {
-                $_SESSION['upload_auth'] = true;
-                $_SESSION['user_upload_password'] = $_POST['upload_password'];
+                jirafeau_user_session_start();
             } else {
-                $_SESSION['admin_auth'] = false;
+                jirafeau_session_end();
                 jirafeau_fatal_error(t('BAD_PSW'), $cfg);
             }
         }
 
         // Show login form if user session is not authorized yet
-        if (true === empty($_SESSION['upload_auth'])) {
+        if (!jirafeau_user_session_logged()) {
             ?>
             <form method="post" class="form login">
             <fieldset>
@@ -75,13 +74,12 @@ elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address(
                 </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'); ?>" />
+                    <input type = "submit" name = "key" value = "<?php echo t('LOGIN'); ?>" />
                     </td>
                 </tr>
                 </table>
@@ -92,8 +90,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address(
             exit;
         }
     }
-}
-else {
+} else {
     jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
 }
 
@@ -107,29 +104,29 @@ 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">⎘</button>
+        <button id="upload_link_button">&#128203;</button>
     </p>
     </div>
 
     <?php if ($cfg['preview'] == true) {
-    ?>
+        ?>
     <div id="upload_finished_preview">
     <p>
         <a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>
     </p><p>
         <code id=preview_link_text></code>
-        <button id="preview_link_button">⎘</button>
+        <button id="preview_link_button">&#128203;</button>
     </p>
     </div>
     <?php
-} ?>
+    } ?>
 
     <div id="upload_direct_download">
     <p>
         <a id="direct_link" href=""><?php echo t('DIRECT_DL') ?></a>
     </p><p>
         <code id=direct_link_text></code>
-        <button id="direct_link_button">⎘</button>
+        <button id="direct_link_button">&#128203;</button>
     </p>
     </div>
 
@@ -138,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">⎘</button>
+        <button id="delete_link_button">&#128203;</button>
     </p>
     </div>
 
@@ -167,118 +164,114 @@ else {
     </legend>
     <p>
         <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') . " " . $cfg['maximal_upload_size']/1024 . " GB.";} 
-			else {echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";} ?>')"/>
+    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">
-        <tr>
-        <td><?php echo t('ONE_TIME_DL'); ?>:</td>
-        <td><input type="checkbox" id="one_time_download" /></td>
-        </tr>
+        <?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><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>
-        <td><input type="password" name="key" id="input_key" /></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_LIM') . ':'; ?></label></td>
         <td><select name="time" id="select_time">
         <?php
-        $expirationTimeOptions = array(
-          array(
-            'value' => 'minute',
-            'label' => '1_MIN'
-          ),
-          array(
-            'value' => 'hour',
-            'label' => '1_H'
-          ),
-          array(
-            'value' => 'day',
-            'label' => '1_D'
-          ),
-          array(
-            'value' => 'week',
-            'label' => '1_W'
-          ),
-          array(
-            'value' => 'month',
-            'label' => '1_M'
-          ),
-          array(
-            'value' => 'quarter',
-            'label' => '1_Q'
-          ),
-          array(
-            'value' => 'year',
-            'label' => '1_Y'
-          ),
-          array(
-            'value' => 'none',
-            'label' => 'NONE'
-          )
-        );
-        foreach ($expirationTimeOptions as $expirationTimeOption) {
-            $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
-            if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
-                echo '<option value="' . $expirationTimeOption['value'] . '" ' .
+$expirationTimeOptions = array(
+  array(
+    'value' => 'minute',
+    'label' => '1_MIN'
+  ),
+  array(
+    'value' => 'hour',
+    'label' => '1_H'
+  ),
+  array(
+    'value' => 'day',
+    'label' => '1_D'
+  ),
+  array(
+    'value' => 'week',
+    'label' => '1_W'
+  ),
+  array(
+      'value' => 'fortnight',
+      'label' => '2_W'
+  ),
+  array(
+    'value' => 'month',
+    'label' => '1_M'
+  ),
+  array(
+    'value' => 'quarter',
+    'label' => '1_Q'
+  ),
+  array(
+    'value' => 'year',
+    'label' => '1_Y'
+  ),
+  array(
+    'value' => 'none',
+    'label' => 'NONE'
+  )
+);
+foreach ($expirationTimeOptions as $expirationTimeOption) {
+    $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
+    if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
+        echo '<option value="' . $expirationTimeOption['value'] . '" ' .
               $selected . '>' . t($expirationTimeOption['label']) . '</option>';
-            }
-        }
-        ?>
+    }
+}
+?>
         </select></td>
         </tr>
 
         <?php
-        if ($cfg['maximal_upload_size'] > 0 && $cfg['maximal_upload_size'] < 1024) {
-            echo '<p class="config">' . t('FILE_LIM');
-            echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
-        }
-		else {
-		    echo '<p class="config">' . t('FILE_LIM');
-            echo " " . $cfg['maximal_upload_size']/1024 . " GB.</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>
-    <?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'); ?>"
     onclick="
         document.getElementById('upload').style.display = 'none';
         document.getElementById('uploading').style.display = '';
-        upload (<?php echo jirafeau_get_max_upload_size_bytes(); ?>);
+        upload (<?php echo jirafeau_get_max_upload_chunk_size_bytes($cfg['max_upload_chunk_size_bytes']); ?>);
     "/>
     </p>
         </table>
     </div> </fieldset>
 
     <?php
-    if (jirafeau_has_upload_password($cfg)
-        && false === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) {
+    if (jirafeau_user_session_logged()) {
         ?>
     <form method="post" class="form logout">
         <input type = "hidden" name = "action" value = "logout"/>
         <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
     </form>
     <?php
-
     }
-    ?>
+?>
 
 </div>
 
@@ -291,8 +284,11 @@ else {
     document.getElementById('send').style.display = 'none';
     if (!check_html5_file_api ())
         document.getElementById('max_file_size').innerHTML = '<?php
-             echo t('NO_BROWSER_SUPPORT') . jirafeau_get_max_upload_size();
-             ?>';
+        $max_size = jirafeau_get_max_upload_size();
+if ($max_size > 0) {
+    echo t('NO_BROWSER_SUPPORT') . $max_size;
+}
+?>';
 
     addCopyListener('upload_link_button', 'upload_link');
     addCopyListener('preview_link_button', 'preview_link');