X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/c3114e0b2e59f3d5e75368d1e29f0c9bbad1eb87..144887f157acdbaa712a56c0393ce12630bf0e90:/index.php?ds=sidebyside diff --git a/index.php b/index.php index b03af76..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 @@ -36,13 +36,13 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php'); /* Check if user is allowed to upload. */ // First check: Challenge by IP NO PASSWORD -if (true === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) { +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['upload_ip'], get_ip_address($cfg))) { +elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { // Is an upload password required? if (jirafeau_has_upload_password($cfg)) { // Logout action @@ -92,8 +92,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address( exit; } } -} -else { +} else { jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } @@ -169,19 +168,21 @@ else { 0) { - echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB."; + echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size']/1024, 2) . " GB."; + } elseif ($cfg['maximal_upload_size'] > 0) { + echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB."; } ?>')"/>

- - - - + '; + echo ''; + } + ?> @@ -239,11 +240,11 @@ else { 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) { + } elseif ($cfg['maximal_upload_size'] > 0) { echo '

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

"; } else { - echo '

'; + echo '

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