X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/f65244fc26208f942fbe5e5cdf5a6570dc493005..779f68ce7bc23cd5b0c0e612db815f1ccfbb35d6:/index.php diff --git a/index.php b/index.php index 39eded5..09b37e4 100644 --- a/index.php +++ b/index.php @@ -34,34 +34,33 @@ if (has_error()) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); /* Check if user is allowed to upload. */ -if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { - - /* Ask password if upload password is set. */ +// 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. */ + // Logout action if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { session_unset(); } - /* Auth. */ + // 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; - echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>'; - require(JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; + jirafeau_fatal_error(t('Wrong password.'), $cfg); } } - /* Show auth page. */ - if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) { + // Show login form if user session is not authorized yet + if (true === empty($_SESSION['upload_auth'])) { ?> - <form action = "<?php echo basename(__FILE__); ?>" method = "post"> + <form method="post"> <fieldset> <table> <tr> @@ -89,7 +88,10 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { } } } - +else { + jirafeau_fatal_error(t('Access denied'), $cfg); +} + ?> <div id="upload_finished"> <p><?php echo t('File uploaded !') ?></p> @@ -108,7 +110,7 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { <p><?php echo t('View link') ?>:</p> <p><a id="preview_link" href=""></a></p> </div> - <?php + <?php } ?> <div id="upload_direct_download"> @@ -243,7 +245,7 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { <?php if (jirafeau_has_upload_password($cfg)) { ?> - <form action = "<?php echo basename(__FILE__); ?>" method = "post"> + <form method="post"> <input type = "hidden" name = "action" value = "logout"/> <input type = "submit" value = "<?php echo t('Logout'); ?>" /> </form>