X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/c3114e0b2e59f3d5e75368d1e29f0c9bbad1eb87..78a1c41c40bb216e3879220fc544f8ae816d3c1b:/index.php?ds=sidebyside diff --git a/index.php b/index.php index b03af76..63906c1 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 @@ -36,13 +36,13 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php'); /* Check if user is allowed to upload. */ // First check: Challenge by IP NO PASSWORD -if (true === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) { +if (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) { $_SESSION['upload_auth'] = true; $_POST['upload_password'] = ''; $_SESSION['user_upload_password'] = $_POST['upload_password']; } // Second check: Challenge by IP -elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { +elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { // Is an upload password required? if (jirafeau_has_upload_password($cfg)) { // Logout action @@ -178,10 +178,12 @@ else { <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="password" name="key" id="input_key" /></td> @@ -274,7 +276,7 @@ else { <?php if (jirafeau_has_upload_password($cfg) - && false === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) { + && false === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) { ?> <form method="post" class="form logout"> <input type = "hidden" name = "action" value = "logout"/>