X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/d8192d6d361c2d707bac679facce23c7167cb93b..8d680388c6ee5495386a31ea22d794df26d5c910:/index.php?ds=inline diff --git a/index.php b/index.php old mode 100755 new mode 100644 index 127d9e6..24565bd --- a/index.php +++ b/index.php @@ -2,7 +2,7 @@ /* * Jirafeau, your web file repository * Copyright (C) 2013 - * Jerome Jutteau + * Jerome Jutteau * Jimmy Beauvois * * This program is free software: you can redistribute it and/or modify @@ -16,176 +16,312 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ -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/template/header.php'); - -check_errors ($cfg); -if (has_error ()) -{ - show_errors (); - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); +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'); -/* Ask password if upload password is set. */ -if (strlen ($cfg['upload_password']) > 0) -{ - session_start(); - - /* Unlog if asked. */ - if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) - $_SESSION['upload_auth'] = false; - - /* Auth. */ - if (isset ($_POST['upload_password'])) - { - if (strcmp ($cfg['upload_password'], $_POST['upload_password']) == 0) - $_SESSION['upload_auth'] = true; - else - { - $_SESSION['admin_auth'] = false; - echo '

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

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; +// Logout action +if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + jirafeau_session_end(); +} + +/* 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(); +} +// 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(); + } else { + jirafeau_session_end(); + jirafeau_fatal_error(t('BAD_PSW'), $cfg); + } } - } - /* Show auth page. */ - if (!isset ($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) - { - ?> -
-
- - - - - - - - - -
- -
-
-
- + +
+

+ +

- : -
- -
+ + +

+ +

+
+ + +
+

+ +
+

+ '?> + +

+
+
+ + +

- : -
- + +

+ +

- -

- : -

+
+ + +
+

+ +

+ + +

+
+ +
+

+ +

+ +

+
+ +
+

:

+

+

-

+ +
+
+

+
+
+
-
+
- +

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

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

-

- - + = 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') . ':
:
-
+
0) - { - ?> -
+ if (jirafeau_user_session_logged()) { + ?> + - +
+?> - - +