X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/89d002baaa196b21ac4d4072e21e7451c47a2355..41f33f9c1dac5381412bcab57c971fd08d1d8613:/index.php?ds=inline diff --git a/index.php b/index.php index 6d1dc10..b6dac09 100644 --- 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 @@ -18,6 +18,7 @@ * 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'); @@ -26,58 +27,59 @@ require(JIRAFEAU_ROOT . 'lib/lang.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'); -/* Check if user is allowed to upload. */ -if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { +// Logout action +if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + jirafeau_session_end(); +} - /* Ask password if upload password is set. */ +/* 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)) { - session_start(); - - /* Unlog if asked. */ - if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { - session_unset(); - } - - /* Auth. */ + // Challenge by password 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(); } else { - $_SESSION['admin_auth'] = false; - echo '

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

'; - require(JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; + jirafeau_session_end(); + jirafeau_fatal_error(t('BAD_PSW'), $cfg); } } - /* Show auth page. */ - if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) { + // Show login form if user session is not authorized yet + if (!jirafeau_user_session_logged()) { ?> -
+
+ -
+
+ size = "40" autocomplete = "current-password" />
@@ -88,48 +90,64 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { exit; } } +} else { + jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } ?>
-

+

- - + + +

+ +

-

+ ?>
-

:

-

+

+ +

+ + +

+ } ?>
-

:

-

+

+ +

+ + +

-
-

:

-

+
+

+ +

+ + +

-
-

:

+
+

:

- +

@@ -142,119 +160,123 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
- +

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

+ '; + 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') . ':
:
- + - + +?>