X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/2dc4984ad57dfcb0ded829bfc9d45493484fe6e3..bfbbf72959faa385b97d250484be1d25e4fd22aa:/index.php diff --git a/index.php b/index.php index ec7aac4..f7aeb04 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,37 +27,41 @@ 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; } - 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. */ -// First check: Challenge by IP -if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { +// First check: Is user already logged +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(); +} +// 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)) { - // Logout action - if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { - session_unset(); - } - // Challenge by password - // â¦save successful logins in session 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(); } 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 - if (true === empty($_SESSION['upload_auth'])) { + if (!jirafeau_user_session_logged()) { ?> <form method="post" class="form login"> <fieldset> @@ -69,13 +73,12 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg </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"> <td class = "nav next"> - <input type = "submit" name = "key" value = - "<?php echo t('LOGIN'); ?>" /> + <input type = "submit" name = "key" value = "<?php echo t('LOGIN'); ?>" /> </td> </tr> </table> @@ -86,8 +89,7 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg exit; } } -} -else { +} else { jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } @@ -101,7 +103,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> @@ -112,7 +114,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 @@ -123,7 +125,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> @@ -132,7 +134,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> @@ -160,19 +162,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> @@ -195,6 +205,10 @@ else { 'value' => 'week', 'label' => '1_W' ), + array( + 'value' => 'fortnight', + 'label' => '2_W' + ), array( 'value' => 'month', 'label' => '1_M' @@ -224,52 +238,44 @@ 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>'; } ?> - <p id="max_file_size" 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=" 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_user_session_logged()) { + ?> <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'; @@ -277,12 +283,16 @@ else { document.getElementById('send').style.display = 'none'; if (!check_html5_file_api ()) document.getElementById('max_file_size').innerHTML = '<?php - echo t('You browser may not support HTML5 so the maximum file size is ') . 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'); addCopyListener('direct_link_button', 'direct_link'); addCopyListener('delete_link_button', 'delete_link'); +// @license-end </script> <?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>