X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/d4e344cf24f5cc5c8c8c563b756cc42530c38fcd..57b10c2bca7fd2727c3eb131bf4d7030094781ed:/index.php?ds=inline diff --git a/index.php b/index.php index ae8f11b..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 @@ -25,8 +25,8 @@ 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(); +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); @@ -50,6 +50,7 @@ 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))) { @@ -59,6 +60,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { 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); @@ -99,70 +101,8 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { } ?> -
-

-
-

- - -

- - -

-
- - -
-

- -
-

- '?> - -

-
-
- - - -
-

- -

- - -

-
- - -
-

- -

- - -

-
- -
-

- -

- - -

-
- -
-

:

-

-
-
+

@@ -190,7 +130,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { 0) { echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB."; } @@ -202,72 +142,32 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { ' . t('ONE_TIME_DL') . ':'; - echo ''; - } - if ($cfg['download_password_requirement'] === 'generated'){ - echo ''; - }else{ - echo ''; - echo ''; - }?> + + echo ' />'; + } +if ($cfg['download_password_requirement'] === 'generated') { + echo ''; +} else { + echo ''; + echo ''; +}?> - + + + = 1024) {