X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/96707e02b8b24054e0827eaf169cc88504a1e78c..18656e6ffc6d35c8e70853e8a4e343e8fe920898:/index.php?ds=sidebyside diff --git a/index.php b/index.php index b8feabd..09b37e4 100644 --- a/index.php +++ b/index.php @@ -34,63 +34,62 @@ 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))) { - echo '<div class="error"><p>' . t('Access denied') . '</p></div>'; - require(JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; -} +// 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(); -/* Ask password if upload password is set. */ -if (jirafeau_has_upload_password($cfg)) { - session_start(); + // Logout action + if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + session_unset(); + } - /* Unlog if asked. */ - 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']; + } else { + $_SESSION['admin_auth'] = false; + jirafeau_fatal_error(t('Wrong password.'), $cfg); + } + } - /* 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']; - } else { - $_SESSION['admin_auth'] = false; - echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>'; + // Show login form if user session is not authorized yet + if (true === empty($_SESSION['upload_auth'])) { + ?> + <form 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; } } - - /* 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); } ?> @@ -111,7 +110,7 @@ if (jirafeau_has_upload_password($cfg)) { <p><?php echo t('View link') ?>:</p> <p><a id="preview_link" href=""></a></p> </div> - <?php + <?php } ?> <div id="upload_direct_download"> @@ -246,7 +245,7 @@ if (jirafeau_has_upload_password($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>