X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/75c98902b1f1be9a4cd1429886c3089c568e532b..6eca3aa915782488ab0d688d7397c42e3fdf30b4:/index.php diff --git a/index.php b/index.php index cd0eed8..9f1b0c7 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'); @@ -34,12 +35,16 @@ if (has_error()) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); /* Check if user is allowed to upload. */ -// First check: Challenge by IP -if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { +// First check: Challenge by IP NO PASSWORD +if (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) { + $_SESSION['upload_auth'] = true; + $_POST['upload_password'] = ''; + $_SESSION['user_upload_password'] = $_POST['upload_password']; +} +// Second 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(); - // Logout action if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { session_unset(); @@ -53,7 +58,7 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg $_SESSION['user_upload_password'] = $_POST['upload_password']; } else { $_SESSION['admin_auth'] = false; - jirafeau_fatal_error(t('Wrong password.'), $cfg); + jirafeau_fatal_error(t('BAD_PSW'), $cfg); } } @@ -65,18 +70,18 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg + -
+
+ size = "40" autocomplete = "current-password" />
@@ -87,47 +92,64 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg exit; } } -} -else { - jirafeau_fatal_error(t('Access denied'), $cfg); +} else { + jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } ?>
-

+

- - + + +

+ +

-

+

+ +

+ + +

-

+

+ +

+ + +

-

+

+ +

+ + +

-

:

+

:

- +

@@ -140,59 +162,71 @@ else {
- +

- ')"/> + 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') . ':
:
- +