X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/f65244fc26208f942fbe5e5cdf5a6570dc493005..6d2f72029699314db90926f57861154ae76d3852:/index.php diff --git a/index.php b/index.php index 39eded5..f60c37d 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,105 @@ 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))) { - - /* Ask password if upload password is set. */ - if (jirafeau_has_upload_password($cfg)) { - session_start(); +// Logout action +if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + jirafeau_session_end(); +} - /* Unlog if asked. */ - if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { - session_unset(); +/* Check if user is allowed to upload. */ +// check if user already logged +if (jirafeau_user_session_logged()) { +} +// check of ldap authentication +elseif (jirafeau_has_ldap_auth($cfg)) { + if (isset($_POST['ldap_user']) and isset($_POST['ldap_password'])) { + $result = jirafeau_challenge_ldap_auth($cfg, $_POST['ldap_user'], $_POST['ldap_password']); + if (true === $result) { + jirafeau_user_session_start(); + } else { + jirafeau_session_end(); + jirafeau_non_fatal_error(t('BAD_PSW')); } - - /* Auth. */ + } + // Show login form if user session is not authorized yet + if (!jirafeau_user_session_logged()) { + ?> + +

' . 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 +136,64 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { exit; } } +} else { + jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } - + ?>
-

+

- - + + +

+ +

-

+ ?>
-

:

-

+

+ +

+ + +

- +
-

:

-

+

+ +

+ + +

-
-

:

-

+
+

+ +

+ + +

-
-

:

+
+

:

- +

@@ -142,119 +206,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') . ':
:
- + - + +?>