X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/0325cfa4d56b6e1090896cca133f769dac06f8d6..2bc76d8baee16b7ba0814c12da52c665158a6d98:/index.php?ds=sidebyside diff --git a/index.php b/index.php index 54e5325..cf54193 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 @@ -35,8 +35,14 @@ 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)) { // Logout action @@ -86,8 +92,7 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg exit; } } -} -else { +} else { jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } @@ -101,7 +106,7 @@ else {

- +

@@ -112,7 +117,7 @@ else {

- +

- +

@@ -132,7 +137,7 @@ else {

- +

@@ -160,19 +165,27 @@ else {

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

- - - - + '; + echo ''; + } + ?> - + @@ -224,9 +237,14 @@ else { 0) { + 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

"; + echo " " . $cfg['maximal_upload_size'] . " MB.

"; + } else { + echo '

'; } ?> @@ -237,12 +255,10 @@ else { ?>
:
' . t('ONE_TIME_DL') . ':