X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/7578ca7e1deb95bef18bb64c3b49d83d78fc3891..8eaac5f4c305c363310494c4625962531906d947:/index.php?ds=sidebyside diff --git a/index.php b/index.php index e860012..33bb83e 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 @@ -27,6 +27,7 @@ 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; @@ -36,10 +37,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 @@ -72,7 +76,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address( + size = "40" autocomplete = "current-password" /> @@ -89,8 +93,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address( exit; } } -} -else { +} else { jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } @@ -104,7 +107,7 @@ else {

- +

@@ -115,7 +118,7 @@ else {

- +

- +

@@ -135,7 +138,7 @@ else {

- +

@@ -163,19 +166,27 @@ else {

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

- - - - + '; + echo ''; + } + ?> - + @@ -198,6 +209,10 @@ else { 'value' => 'week', 'label' => '1_W' ), + array( + 'value' => 'fortnight', + 'label' => '2_W' + ), array( 'value' => 'month', 'label' => '1_M' @@ -227,9 +242,14 @@ else { 0) { + if ($cfg['maximal_upload_size'] >= 1024) { echo '

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

"; + 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 '

'; } ?> @@ -240,19 +260,17 @@ else { ?>

:
' . t('ONE_TIME_DL') . ':
@@ -260,14 +278,13 @@ else {
@@ -282,8 +299,11 @@ else { document.getElementById('send').style.display = 'none'; if (!check_html5_file_api ()) document.getElementById('max_file_size').innerHTML = ''; + $max_size = jirafeau_get_max_upload_size(); + if ($max_size > 0) { + echo t('NO_BROWSER_SUPPORT') . $max_size; + } + ?>'; addCopyListener('upload_link_button', 'upload_link'); addCopyListener('preview_link_button', 'preview_link');