X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/0b85af176ceecbd94fad0b48977abf6eeff9c0c0..0b8bc44d7afc8c7249c697a7584fc9d1646e7c4d:/index.php diff --git a/index.php b/index.php index 8e512b6..33bb83e 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,6 +27,7 @@ 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; @@ -36,13 +37,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 @@ -75,7 +76,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"> @@ -92,8 +93,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address( exit; } } -} -else { +} else { jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } @@ -167,20 +167,26 @@ 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> @@ -203,6 +209,10 @@ else { 'value' => 'week', 'label' => '1_W' ), + array( + 'value' => 'fortnight', + 'label' => '2_W' + ), array( 'value' => 'month', 'label' => '1_M' @@ -232,13 +242,14 @@ else { </tr> <?php - if ($cfg['maximal_upload_size'] > 0 && $cfg['maximal_upload_size'] < 1024) { + 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">' . t('FILE_LIM'); - echo " " . $cfg['maximal_upload_size']/1024 . " GB.</p>"; + } else { + echo '<p class="config"></p>'; } ?> @@ -249,19 +260,17 @@ 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> @@ -269,14 +278,13 @@ else { <?php if (jirafeau_has_upload_password($cfg) - && false === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($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 - } ?> @@ -291,8 +299,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');