X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/71e621e81a096fce132f70ee3918279cc71dd23f..a9248c01e37d3085a832671e795754e780e831c9:/index.php?ds=sidebyside diff --git a/index.php b/index.php index 7c24e3b..7ce9532 100644 --- a/index.php +++ b/index.php @@ -34,35 +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)) || - count($cfg['upload_ip']) == 0) { - - /* 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 method="post"> + <form method="post" class="form login"> <fieldset> <table> <tr> @@ -88,12 +86,11 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) || require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } - } else { - echo '<div class="error"><p>' . t('Access denied') . '</p></div>'; - require(JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; } -} +} +else { + jirafeau_fatal_error(t('Access denied'), $cfg); +} ?> <div id="upload_finished"> @@ -121,12 +118,12 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) || <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> @@ -248,7 +245,7 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) || <?php if (jirafeau_has_upload_password($cfg)) { ?> - <form method="post"> + <form method="post" class="form logout"> <input type = "hidden" name = "action" value = "logout"/> <input type = "submit" value = "<?php echo t('Logout'); ?>" /> </form>