X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/261af8ac3be2c4d9fbdae0f25c036440833d746c..refs/heads/bug_classic_download:/index.php diff --git a/index.php b/index.php index f9eded5..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,127 +18,95 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); +session_start(); +define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); -require (JIRAFEAU_ROOT . 'lib/config.original.php'); -require (JIRAFEAU_ROOT . 'lib/settings.php'); -require (JIRAFEAU_ROOT . 'lib/functions.php'); -require (JIRAFEAU_ROOT . 'lib/lang.php'); +require(JIRAFEAU_ROOT . 'lib/settings.php'); +require(JIRAFEAU_ROOT . 'lib/functions.php'); +require(JIRAFEAU_ROOT . 'lib/lang.php'); -check_errors ($cfg); -if (has_error ()) -{ - show_errors (); - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); - exit; +if ($cfg['download_password_requirement'] === "generated") { + $download_pass = jirafeau_gen_download_pass($cfg['download_password_gen_len'], $cfg['download_password_gen_chars']); } -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 '

' . t('Access denied') . '

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); +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'); -/* Ask password if upload password is set. */ -if (jirafeau_has_upload_password ($cfg)) -{ - session_start(); - - /* Unlog if asked. */ - if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) - session_unset (); +// Logout action +if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + jirafeau_session_end(); +} - /* 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']; +/* Check if user is allowed to upload. */ +// 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)) { + // Challenge by password + if (isset($_POST['upload_password'])) { + if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) { + jirafeau_user_session_start(); + $_SESSION['user_auth_type'] = JIRAFEAU_USER_AUTH_BY_PASSWORD; + } else { + jirafeau_session_end(); + jirafeau_fatal_error(t('BAD_PSW'), $cfg); + } } - else - { - $_SESSION['admin_auth'] = false; - echo '

' . t('Wrong password.') . '

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); + + // Show login form if user session is not authorized yet + if (!jirafeau_user_session_logged()) { + ?> + + -
-
- - - - - - - - - -
- -
-
-
- -
-

- -
-

- - -

-

-
- - -
-

:

-

-
- -
-

:

-

-
- -
-

:

-

-
- -
-

:

-

-
-
+

- +

@@ -149,101 +117,93 @@ if (jirafeau_has_upload_password ($cfg))
-
+
- +

- ')"/> + 0) { + echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB."; + } +?>')"/>

+ '; + echo ''; + } +if ($cfg['download_password_requirement'] === 'generated') { + echo ''; +} else { + echo ''; + echo ''; +}?> - - - - - - - - - - + + 0) - { - echo '

' . t ('File size is limited to'); - echo " " . $cfg['maximal_upload_size'] . " MB

"; - } - ?> +if ($cfg['maximal_upload_size'] >= 1024) { + echo '

' . t('FILE_LIM'); + echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.

"; +} elseif ($cfg['maximal_upload_size'] > 0) { + echo '

' . t('FILE_LIM'); + echo " " . $cfg['maximal_upload_size'] . " MB.

"; +} else { + echo '

'; +} +?> -

+

- - - - - - +

' . t('ONE_TIME_DL') . ':
:
+ +
-
+
-
+ if (jirafeau_user_session_logged() && $_SESSION['user_auth_type'] == JIRAFEAU_USER_AUTH_BY_PASSWORD) { + ?> + - +
+?> - +