X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/4823b32b6ce68f7a6a0949c225c808da4979506f..ac471fd7432906217f7a2d46b37d49b1c9f512ea:/index.php?ds=inline

diff --git a/index.php b/index.php
index 24ce25c..37dd677 100644
--- a/index.php
+++ b/index.php
@@ -25,8 +25,8 @@ require(JIRAFEAU_ROOT . 'lib/settings.php');
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 
-if ($cfg['download_password_requirement'] === "generated"){
-    $download_pass = jirafeau_gen_download_pass();
+if ($cfg['download_password_requirement'] === "generated") {
+    $download_pass = jirafeau_gen_download_pass($cfg['download_password_gen_len'], $cfg['download_password_gen_chars']);
 }
 
 check_errors($cfg);
@@ -50,6 +50,7 @@ if (jirafeau_user_session_logged()) {
 // Second check: Challenge by IP NO PASSWORD
 elseif (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
     jirafeau_user_session_start();
+    $_SESSION['user_auth_type'] = JIRAFEAU_USER_AUTH_BY_IP_NO_PASSWORD;
 }
 // Third check: Challenge by IP
 elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
@@ -59,6 +60,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
         if (isset($_POST['upload_password'])) {
             if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {
                 jirafeau_user_session_start();
+                $_SESSION['user_auth_type'] = JIRAFEAU_USER_AUTH_BY_PASSWORD;
             } else {
                 jirafeau_session_end();
                 jirafeau_fatal_error(t('BAD_PSW'), $cfg);
@@ -112,8 +114,8 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
     </p>
     </div>
 
-    <?php if ($cfg['download_password_requirement'] === "generated"){
-    ?>
+    <?php if ($cfg['download_password_requirement'] === "generated") {
+        ?>
     <div id="show_password">
     <p><?php echo t('PSW') ?></p>
 
@@ -177,7 +179,12 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
 </div>
 
 <div id="upload">
-<fieldset>
+<form id="upload-form" onsubmit="
+            event.preventDefault();
+            document.getElementById('upload').style.display = 'none';
+            document.getElementById('uploading').style.display = '';
+            upload (<?php echo jirafeau_get_max_upload_chunk_size_bytes($cfg['max_upload_chunk_size_bytes']); ?>);
+            "><fieldset>
     <legend>
     <?php echo t('SEL_FILE'); ?>
     </legend>
@@ -199,15 +206,15 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
             echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
             echo '<td><input type="checkbox" id="one_time_download" /></td></tr>';
         }
-        if ($cfg['download_password_requirement'] === 'generated'){
+        if ($cfg['download_password_requirement'] === 'generated') {
             echo '<input type="hidden" name="key" id="input_key" value="' . $download_pass .'"/>';
-        }else{
+        } else {
             echo '<tr><td><label for="input_key">' . t('PSW') . ':' . '</label></td>';
             echo '<td><input type="password" name="key" id="input_key" autocomplete = "new-password"';
-            if ($cfg['download_password_policy'] === 'regex'){
+            if ($cfg['download_password_policy'] === 'regex') {
                 echo ' pattern="' . substr($cfg['download_password_policy_regex'], 1, strlen($cfg['download_password_policy_regex']) - 2) . '"'; //remove php delimiters
             }
-            if ($cfg['download_password_requirement'] === 'required'){
+            if ($cfg['download_password_requirement'] === 'required') {
                 echo ' required';
             }
             echo '/></td></tr>';
@@ -279,18 +286,13 @@ if ($cfg['maximal_upload_size'] >= 1024) {
 
         <p id="max_file_size" class="config"></p>
     <p>
-    <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_chunk_size_bytes($cfg['max_upload_chunk_size_bytes']); ?>);
-    "/>
+    <input type="submit" id="send" value="<?php echo t('SEND'); ?>"/>
     </p>
         </table>
-    </div> </fieldset>
+    </div> </fieldset></form>
 
     <?php
-    if (jirafeau_user_session_logged()) {
+    if (jirafeau_user_session_logged() && $_SESSION['user_auth_type'] == JIRAFEAU_USER_AUTH_BY_PASSWORD) {
         ?>
     <form method="post" class="form logout">
         <input type = "hidden" name = "action" value = "logout"/>