X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/b402561271f0de4f4c12fc8f8c7d51d12e0a3e5c..0c8f8d01c69039e9e8c98de2a026b43fdcdf1951:/index.php diff --git a/index.php b/index.php index 09b37e4..832749b 100644 --- a/index.php +++ b/index.php @@ -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,30 +58,30 @@ 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); } } // Show login form if user session is not authorized yet if (true === empty($_SESSION['upload_auth'])) { ?> -
+
+ -
+
@@ -89,49 +94,63 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg } } else { - jirafeau_fatal_error(t('Access denied'), $cfg); + jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } ?>
-

+

- - + + +

+ +

-

-

:

-

+

+ +

+ + +

-

:

-

+

+ +

+ + +

-
-

:

-

+
+

+ +

+ + +

-
-

:

+
+

:

- +

@@ -144,59 +163,65 @@ else {
- +

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

- + - - + + - + 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.

"; + } else if ($cfg['maximal_upload_size'] > 0) { + echo '

' . t('FILE_LIM'); + echo " " . $cfg['maximal_upload_size'] . " MB.

"; + } else { + echo '

'; } ?> -

+

-

::
- + - +