X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/6c160f220551712c82c642f45d2e70ba070c04ae..7846b6b73a7b4cc2f66249ed5ab995121e493b65:/index.php?ds=inline diff --git a/index.php b/index.php index 5c3ffce..9f1b0c7 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 @@ -36,10 +36,13 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php'); /* 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))) { +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['upload_ip'], get_ip_address($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 @@ -72,7 +75,7 @@ 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"> @@ -89,8 +92,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address( exit; } } -} -else { +} else { jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } @@ -104,7 +106,7 @@ 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">📋</button> </p> </div> @@ -115,7 +117,7 @@ else { <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">📋</button> </p> </div> <?php @@ -126,7 +128,7 @@ else { <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">📋</button> </p> </div> @@ -135,7 +137,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">📋</button> </p> </div> @@ -163,19 +165,27 @@ else { <?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('2_BIG') . ', ' . t('FILE_LIM') . " " . $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"> - <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="text" 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> @@ -198,6 +208,10 @@ else { 'value' => 'week', 'label' => '1_W' ), + array( + 'value' => 'fortnight', + 'label' => '2_W' + ), array( 'value' => 'month', 'label' => '1_M' @@ -227,9 +241,14 @@ else { </tr> <?php - if ($cfg['maximal_upload_size'] > 0) { + if ($cfg['maximal_upload_size'] >= 1024) { echo '<p class="config">' . t('FILE_LIM'); - echo " " . $cfg['maximal_upload_size'] . " MB</p>"; + 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>'; } ?> @@ -240,33 +259,31 @@ else { ?> <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)) { + 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'); ?>" /> </form> <?php - } ?>