Another attempt to fix linting

diff --git a/index.php b/index.php
index 29562ff7e30aa50e618db932b7f9059ec9b39b12..2b840135b99ac868570293f734d90aeb75fbd3f7 100644 (file)
--- a/index.php
+++ b/index.php
@@ -28,10 +28,7 @@ require(JIRAFEAU_ROOT . 'lib/lang.php');
 $download_pass = null;
 
 if ($cfg['download_password_requirement'] === 'generated') {
 $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']
-    );
+    $download_pass = jirafeau_gen_download_pass($cfg['download_password_gen_len'], $cfg['download_password_gen_chars']);

 }
 
 check_errors($cfg);
 }
 
 check_errors($cfg);


@@ -41,18 +38,16 @@ if (has_error()) {
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }

-

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

-if (isset($_POST['action']) && strcmp($_POST['action'], 'logout') === 0) {
+if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {

     jirafeau_session_end();
 }
 
 /* Check if user is allowed to upload. */
 // First check: Is user already logged
 if (jirafeau_user_session_logged()) {
     jirafeau_session_end();
 }
 
 /* Check if user is allowed to upload. */
 // 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))) {
 }
 // Second check: Challenge by IP NO PASSWORD
 elseif (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {


@@ -78,164 +73,165 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
         if (!jirafeau_user_session_logged()) {
             ?>
             <form method="post" class="form login">
         if (!jirafeau_user_session_logged()) {
             ?>
             <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);
 }

+

 ?>
 
 <?php jirafeau_create_upload_finished_box($cfg['preview'], $download_pass); ?>
 
 <div id="uploading">
     <p>
 ?>
 
 <?php jirafeau_create_upload_finished_box($cfg['preview'], $download_pass); ?>
 
 <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">

-    <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>
-            <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 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>
+    <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>

 
 

-    <?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 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"';

 
 

-</div>
+            if ($cfg['one_time_download_preselected']) {
+                echo ' checked';
+            }

 
 

-<script type="text/javascript" lang="Javascript">
-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;
+            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><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, strlen($cfg['download_password_policy_regex']) - 2) . '"'; //remove php delimiters

     }
     }

-    ?>';
+    if ($cfg['download_password_requirement'] === 'required') {
+        echo ' required';
+    }
+    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');
+    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>';

 }
 }

+?>

 
 

-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');
+        <p id="max_file_size" class="config"></p>
+    <p>
+    <input type="submit" id="send" value="<?php echo t('SEND'); ?>"/>
+    </p>
+        </table>
+    </div> </fieldset></form>
+
+    <?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
+    }
+?>

 
 

+</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
+        $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');
+    addTextCopyListener('password_copy_button', 'output_key');
+// @license-end

 // show password toggle
 // show password toggle

-document.getElementById('show_password')?.addEventListener('change', function() {
-    const pwd = document.getElementById('input_key');
-    if (pwd) {
-        pwd.type = this.checked ? 'text' : 'password';
-    }
-});
+    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'); ?>