X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/4b8e9e4372b345d72eaaa5341dfbb0aa6d3a6970..e2d6cda643fb68b8f831ee7e4337d5e198cc83dd:/index.php?ds=inline diff --git a/index.php b/index.php index 4371e9e..7ce9532 100644 --- a/index.php +++ b/index.php @@ -18,87 +18,78 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); +define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); -require (JIRAFEAU_ROOT . 'lib/config.original.php'); -require (JIRAFEAU_ROOT . 'lib/settings.php'); -require (JIRAFEAU_ROOT . 'lib/functions.php'); -require (JIRAFEAU_ROOT . 'lib/lang.php'); +require(JIRAFEAU_ROOT . 'lib/settings.php'); +require(JIRAFEAU_ROOT . 'lib/functions.php'); +require(JIRAFEAU_ROOT . 'lib/lang.php'); -check_errors ($cfg); -if (has_error ()) -{ - show_errors (); - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); +check_errors($cfg); +if (has_error()) { + show_errors(); + require(JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } -require (JIRAFEAU_ROOT . 'lib/template/header.php'); +require(JIRAFEAU_ROOT . 'lib/template/header.php'); /* Check if user is allowed to upload. */ -if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg))) -{ - echo '<div class="error"><p>' . t('Access denied') . '</p></div>'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; -} - -/* Ask password if upload password is set. */ -if (jirafeau_has_upload_password ($cfg)) -{ - session_start(); +// First check: Challenge by IP +if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { + // Is an upload password required? + if (jirafeau_has_upload_password($cfg)) { + session_start(); - /* Unlog if asked. */ - if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) - session_unset (); + // Logout action + if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + session_unset(); + } - /* Auth. */ - 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']; + // 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']; + } else { + $_SESSION['admin_auth'] = false; + jirafeau_fatal_error(t('Wrong password.'), $cfg); + } } - else - { - $_SESSION['admin_auth'] = false; - echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); + + // Show login form if user session is not authorized yet + if (true === empty($_SESSION['upload_auth'])) { + ?> + <form method="post" class="form login"> + <fieldset> + <table> + <tr> + <td class = "label"><label for = "enter_password"> + <?php echo t('Upload password') . ':'; ?></label> + </td> + <td class = "field"><input type = "password" + name = "upload_password" id = "upload_password" + size = "40" /> + </td> + </tr> + <tr class = "nav"> + <td></td> + <td class = "nav next"> + <input type = "submit" name = "key" value = + "<?php echo t('Login'); ?>" /> + </td> + </tr> + </table> + </fieldset> + </form> + <?php + require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } } - - /* Show auth page. */ - if (!isset ($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) - { - ?> - <form action = "<?php echo basename(__FILE__); ?>" method = "post"> - <fieldset> - <table> - <tr> - <td class = "label"><label for = "enter_password"> - <?php echo t('Upload password') . ':';?></label> - </td> - <td class = "field"><input type = "password" - name = "upload_password" id = "upload_password" - size = "40" /> - </td> - </tr> - <tr class = "nav"> - <td></td> - <td class = "nav next"> - <input type = "submit" name = "key" value = - "<?php echo t('Login'); ?>" /> - </td> - </tr> - </table> - </fieldset> - </form> - <?php - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; - } +} +else { + jirafeau_fatal_error(t('Access denied'), $cfg); } ?> @@ -113,24 +104,26 @@ if (jirafeau_has_upload_password ($cfg)) <p><a id="upload_link" href=""></a></p> </div> - <?php if ($cfg['preview'] == true) { ?> + <?php if ($cfg['preview'] == true) { + ?> <div id="upload_finished_preview"> <p><?php echo t('View link') ?>:</p> <p><a id="preview_link" href=""></a></p> </div> - <?php } ?> + <?php +} ?> <div id="upload_direct_download"> <p><?php echo t('Direct download link') ?>:</p> <p><a id="direct_link" href=""></a></p> </div> - <div> + <div id="upload_delete"> <p><?php echo t('Delete link') ?>:</p> <p><a id="delete_link" href=""></a></p> </div> - <div id="validity"> + <div id="upload_validity"> <p><?php echo t('This file is valid until the following date'); ?>:</p> <p id="date"></p> </div> @@ -138,7 +131,7 @@ if (jirafeau_has_upload_password ($cfg)) <div id="uploading"> <p> - <?php echo t ('Uploading ...'); ?> + <?php echo t('Uploading ...'); ?> <div id="uploaded_percentage"></div> <div id="uploaded_speed"></div> <div id="uploaded_time"></div> @@ -155,7 +148,7 @@ if (jirafeau_has_upload_password ($cfg)) </legend> <p> <input type="file" id="file_select" size="30" - onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t ('File is too big') . ', ' . t ('File size is limited to') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/> + onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t('File is too big') . ', ' . t('File size is limited to') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/> </p> <div id="options"> @@ -207,59 +200,57 @@ if (jirafeau_has_upload_password ($cfg)) ) ); foreach ($expirationTimeOptions as $expirationTimeOption) { - $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : ''; - if(true === $cfg['availabilities'][$expirationTimeOption['value']]) { - echo '<option value="' . $expirationTimeOption['value'] . '" ' . + $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'] > 0) - { - echo '<p class="config">' . t ('File size is limited to'); - echo " " . $cfg['maximal_upload_size'] . " MB</p>"; + if ($cfg['maximal_upload_size'] > 0) { + echo '<p class="config">' . t('File size is limited to'); + echo " " . $cfg['maximal_upload_size'] . " MB</p>"; } ?> <p id="max_file_size" class="config"></p> <p> <?php - if (jirafeau_has_upload_password ($cfg) && $_SESSION['upload_auth']) - { - ?> + 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 - { - ?> + + } 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 $cfg['web_root']; ?>', <?php echo jirafeau_get_max_upload_size_bytes (); ?>); + upload ('<?php echo $cfg['web_root']; ?>', <?php echo jirafeau_get_max_upload_size_bytes(); ?>); "/> </p> </table> </div> </fieldset> <?php - if (jirafeau_has_upload_password ($cfg)) - { - ?> - <form action = "<?php echo basename(__FILE__); ?>" method = "post"> + if (jirafeau_has_upload_password($cfg)) { + ?> + <form method="post" class="form logout"> <input type = "hidden" name = "action" value = "logout"/> <input type = "submit" value = "<?php echo t('Logout'); ?>" /> </form> <?php + } ?> @@ -273,7 +264,7 @@ if (jirafeau_has_upload_password ($cfg)) 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 (); + echo t('You browser may not support HTML5 so the maximum file size is ') . jirafeau_get_max_upload_size(); ?>'; </script> -<?php require (JIRAFEAU_ROOT . 'lib/template/footer.php'); ?> +<?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>