X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/fd3aaad433fe7e041f85752a727bb14b8865dc31..471c7b967a8ca4efb933aa93a89665c1bb466706:/index.php diff --git a/index.php b/index.php index 9a7b9ec..435e059 100644 --- a/index.php +++ b/index.php @@ -1,9 +1,9 @@ - * Jimmy Beauvois + * Copyright (C) 2008 Julien "axolotl" BERNARD + * Copyright (C) 2015 Jerome Jutteau + * Copyright (C) 2024 Jirafeau project (see AUTHORS.md) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -18,65 +18,74 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ +session_start(); define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); require(JIRAFEAU_ROOT . 'lib/settings.php'); require(JIRAFEAU_ROOT . 'lib/functions.php'); require(JIRAFEAU_ROOT . 'lib/lang.php'); +if ($cfg['download_password_requirement'] === "generated") { + $download_pass = jirafeau_gen_download_pass($cfg['download_password_gen_len'], $cfg['download_password_gen_chars']); +} + check_errors($cfg); if (has_error()) { + require(JIRAFEAU_ROOT . 'lib/template/header.php'); show_errors(); require(JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } - require(JIRAFEAU_ROOT . 'lib/template/header.php'); +// Logout action +if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + jirafeau_session_end(); +} + /* Check if user is allowed to upload. */ -// First check: Challenge by IP -if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { +// First check: Is user already logged +if (jirafeau_user_session_logged()) { +} +// Second check: Challenge by IP NO PASSWORD +elseif (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) { + jirafeau_user_session_start(); + $_SESSION['user_auth_type'] = JIRAFEAU_USER_AUTH_BY_IP_NO_PASSWORD; +} +// Third check: Challenge by IP +elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { // Is an upload password required? if (jirafeau_has_upload_password($cfg)) { - session_start(); - - // Logout action - 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']; + jirafeau_user_session_start(); + $_SESSION['user_auth_type'] = JIRAFEAU_USER_AUTH_BY_PASSWORD; } else { - $_SESSION['admin_auth'] = false; - jirafeau_fatal_error(t('Wrong password.'), $cfg); + jirafeau_session_end(); + jirafeau_fatal_error(t('BAD_PSW'), $cfg); } } // Show login form if user session is not authorized yet - if (true === empty($_SESSION['upload_auth'])) { + if (!jirafeau_user_session_logged()) { ?>
- +
+?>