Trying to make linting happy

[jirafeau/jirafeau.git] / index.php

diff --git a/index.php b/index.php
index 9edb3af0668ead01a07084a923f88d777925b537..29562ff7e30aa50e618db932b7f9059ec9b39b12 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,9 +1,9 @@
 <?php
 /*
  *  Jirafeau, your web file repository
 <?php
 /*
  *  Jirafeau, your web file repository

- *  Copyright (C) 2013
- *  Jerome Jutteau <jerome@jutteau.fr>
- *  Jimmy Beauvois <jimmy.beauvois@gmail.com>
+ *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
+ *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>
+ *  Copyright (C) 2024  Jirafeau project <https://gitlab.com/jirafeau> (see AUTHORS.md)

  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as


@@ -25,8 +25,18 @@ require(JIRAFEAU_ROOT . 'lib/settings.php');
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 

+$download_pass = null;
+
+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);
 if (has_error()) {
 check_errors($cfg);
 if (has_error()) {

+    require(JIRAFEAU_ROOT . 'lib/template/header.php');

     show_errors();
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
     show_errors();
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;


@@ -34,277 +44,198 @@ if (has_error()) {
 
 require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
 
 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. */
 /* Check if user is allowed to upload. */

-// 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'];
+// First check: Is user already logged
+if (jirafeau_user_session_logged()) {
+    // nothing to do here
+}
+// 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;

 }
 }

-// Second check: Challenge by IP
+// 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)) {
 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
         // Challenge by password

-        // …save successful logins in session

         if (isset($_POST['upload_password'])) {
             if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {
         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();
+                $_SESSION['user_auth_type'] = JIRAFEAU_USER_AUTH_BY_PASSWORD;

             } else {
             } 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
                 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">
             ?>
             <form method="post" class="form login">

-            <fieldset>
-                <table>
-                <tr>
-                    <td class = "label"><label for = "enter_password">
-                    <?php echo t('UP_PSW') . ':'; ?></label>
-                    </td>
-                </tr><tr>
-                    <td class = "field"><input type = "password"
-                    name = "upload_password" id = "upload_password"
-                    size = "40" autocomplete = "current-password" />
-                    </td>
-                </tr>
-                <tr class = "nav">
-                    <td class = "nav next">
-                    <input type = "submit" name = "key" value =
-                    "<?php echo t('LOGIN'); ?>" />
-                    </td>
-                </tr>
-                </table>
-            </fieldset>
+                <fieldset>
+                    <table>
+                        <tr>
+                            <td class="label">
+                                <label for="enter_password"><?php echo t('UP_PSW') . ':'; ?></label>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="field">
+                                <input type="password" name="upload_password" id="upload_password" size="40" autocomplete="current-password" />
+                            </td>
+                        </tr>
+                        <tr class="nav">
+                            <td class="nav next">
+                                <input type="submit" name="key" value="<?php echo t('LOGIN'); ?>" />
+                            </td>
+                        </tr>
+                    </table>
+                </fieldset>

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

-            require(JIRAFEAU_ROOT.'lib/template/footer.php');
+            require(JIRAFEAU_ROOT . 'lib/template/footer.php');

             exit;
         }
     }
 } else {
     jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
 }
             exit;
         }
     }
 } else {
     jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
 }

-

 ?>
 ?>

-<div id="upload_finished">
-    <p><?php echo t('FILE_UP') ?></p>

 
 

-    <div id="upload_finished_download_page">
-    <p>
-        <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>
-        <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">&#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">&#128203;</button>
-    </p>
-    </div>
-
-    <div id="upload_delete">
-    <p>
-        <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('VALID_UNTIL'); ?>:</p>
-    <p id="date"></p>
-    </div>
-</div>
+<?php jirafeau_create_upload_finished_box($cfg['preview'], $download_pass); ?>

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

-    <?php echo t('UP'); ?>
-    <div id="uploaded_percentage"></div>
-    <div id="uploaded_speed"></div>
-    <div id="uploaded_time"></div>
+        <?php echo t('UP'); ?>
+        <div id="uploaded_percentage"></div>
+        <div id="uploaded_speed"></div>
+        <div id="uploaded_time"></div>

     </p>
 </div>
 
     </p>
 </div>
 

-<div id="error_pop" class="error">
-</div>
+<div id="error_pop" class="error"></div>

 
 <div id="upload">
 
 <div id="upload">

-<fieldset>
-    <legend>
-    <?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
-        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><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_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' => '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'] >= 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="
+    <form id="upload-form" onsubmit="
+        event.preventDefault();

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

-        upload (<?php echo jirafeau_get_max_upload_size_bytes(); ?>);
-    "/>
-    </p>
-        </table>
-    </div> </fieldset>
-
-    <?php
-    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'); ?>" />
+        upload(<?php echo jirafeau_get_max_upload_chunk_size_bytes($cfg['max_upload_chunk_size_bytes']); ?>);
+    ">
+        <fieldset>
+            <legend><?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
+                           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"';
+                        if ($cfg['one_time_download_preselected']) {
+                            echo ' checked';
+                        }
+                        echo ' /></td></tr>';
+                    }
+
+                    if ($cfg['download_password_requirement'] === 'generated') {
+                        echo '<input type="hidden" name="key" id="input_key" value="' . $download_pass . '"/>';
+                    } else {
+                        echo '<tr><td><label for="input_key">' . t('PSW') . ':' . '</label></td>';
+                        echo '<td>';
+                        echo '<input type="password" name="key" id="input_key" autocomplete="new-password"';
+                        if ($cfg['download_password_policy'] === 'regex') {
+                            echo ' pattern="' . substr($cfg['download_password_policy_regex'], 1, -1) . '"';
+                        }
+                        if ($cfg['download_password_requirement'] === 'required') {
+                            echo ' required';
+                        }
+                        echo ' />';
+                        echo ' <input type="checkbox" id="show_password"> <label for="show_password">Show password</label>';
+                        echo '</td></tr>';
+                    }
+                    ?>
+
+                    <tr>
+                        <td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td>
+                        <td><?php jirafeau_create_selection_array($cfg); ?></td>
+                    </tr>
+
+                    <?php
+                    if ($cfg['maximal_upload_size'] >= 1024) {
+                        echo '<p class="config">' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</p>";
+                    } elseif ($cfg['maximal_upload_size'] > 0) {
+                        echo '<p class="config">' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.</p>";
+                    } else {
+                        echo '<p class="config"></p>';
+                    }
+                    ?>
+
+                    <p id="max_file_size" class="config"></p>
+                    <p>
+                        <input type="submit" id="send" value="<?php echo t('SEND'); ?>"/>
+                    </p>
+                </table>
+            </div>
+        </fieldset>

     </form>
     </form>

-    <?php
-    }
-    ?>
+
+    <?php 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"/>
+            <input type="submit" value="<?php echo t('LOGOUT'); ?>" />
+        </form>
+    <?php endif; ?>

 
 </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('options').style.display = 'none';
-    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();
-             ?>';
+document.getElementById('error_pop').style.display = 'none';
+document.getElementById('uploading').style.display = 'none';
+document.getElementById('upload_finished').style.display = 'none';
+document.getElementById('options').style.display = 'none';
+document.getElementById('send').style.display = 'none';
+
+if (!check_html5_file_api()) {
+    document.getElementById('max_file_size').innerHTML = '<?php
+    $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');
-    addCopyListener('direct_link_button', 'direct_link');
-    addCopyListener('delete_link_button', 'delete_link');
-// @license-end
+addCopyListener('upload_link_button', 'upload_link');
+addCopyListener('preview_link_button', 'preview_link');
+addCopyListener('direct_link_button', 'direct_link');
+addCopyListener('delete_link_button', 'delete_link');
+addTextCopyListener('password_copy_button', 'output_key');
+
+// show password toggle
+document.getElementById('show_password')?.addEventListener('change', function() {
+    const pwd = document.getElementById('input_key');
+    if (pwd) {
+        pwd.type = this.checked ? 'text' : 'password';
+    }
+});

 </script>
 </script>

+

 <?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>
 <?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>