X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/be0e8b0e4cf5fd12cde0517e4b355bbc0633096a..c7f776c8b948b033c200c8fd84ab5e8a8422d601:/index.php?ds=sidebyside diff --git a/index.php b/index.php index 660c18e..9edb3af 100644 --- a/index.php +++ b/index.php @@ -1,8 +1,9 @@ - * Copyright (C) 2012 Jerome Jutteau + * Copyright (C) 2013 + * Jerome Jutteau + * Jimmy Beauvois * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -15,157 +16,295 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ -define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); +session_start(); +define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); -require (JIRAFEAU_ROOT . 'lib/config.php'); -require (JIRAFEAU_ROOT . 'lib/settings.php'); -require (JIRAFEAU_ROOT . 'lib/functions.php'); -require (JIRAFEAU_ROOT . 'lib/lang.php'); +require(JIRAFEAU_ROOT . 'lib/settings.php'); +require(JIRAFEAU_ROOT . 'lib/functions.php'); +require(JIRAFEAU_ROOT . 'lib/lang.php'); -if (file_exists (JIRAFEAU_ROOT . 'install.php') - && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php')) -{ - header('Location: install.php'); +check_errors($cfg); +if (has_error()) { + show_errors(); + require(JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } -/* check if the destination dirs are writable */ -$writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS); - -$res = array (); -if ($writable && isset ($_POST['jirafeau'])) -{ - $key = $_POST['key']; - - $time = time (); - switch ($_POST['time']) - { - case 'minute': - $time += JIRAFEAU_MINUTE; - break; - case 'hour': - $time += JIRAFEAU_HOUR; - break; - case 'day': - $time += JIRAFEAU_DAY; - break; - case 'week': - $time += JIRAFEAU_WEEK; - break; - case 'month': - $time += JIRAFEAU_MONTH; - break; - default: - $time = JIRAFEAU_INFINITY; - break; - } +require(JIRAFEAU_ROOT . 'lib/template/header.php'); - $res = - jirafeau_upload ($_FILES['file'], isset ($_POST['one_time_download']), - $key, $time, $cfg, $_SERVER['REMOTE_ADDR']); +/* Check if user is allowed to upload. */ +// 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 + if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + session_unset(); + } -require (JIRAFEAU_ROOT . 'lib/template/header.php'); - -/* Checking for errors. */ -if (!is_writable (VAR_FILES)) - add_error (t('The file directory is not writable!'), VAR_FILES); - -if (!is_writable (VAR_LINKS)) - add_error (t('The link directory is not writable!'), VAR_LINKS); - -/* Check if the install.php script is still in the directory. */ -if (file_exists (JIRAFEAU_ROOT . 'install.php')) - add_error (t('Installer script still present'), - t('Please make sure to delete the installer script ' . - '"install.php" before continuing.')); - -if (!has_error () && !empty ($res)) -{ - if ($res['error']['has_error']) - add_error (t('An error occurred.'), $res['error']['why']); - else - { - $link = $cfg['web_root']; - $delete_link = $cfg['web_root']; - - if ($cfg['rewrite']) - { - $link .= 'file-'.$res['link']; - $delete_link .= - 'file-'.$res['link'].'-delete-'.$res['delete_link']; + // Challenge by password + // …save successful logins in session + if (isset($_POST['upload_password'])) { + if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) { + $_SESSION['upload_auth'] = true; + $_SESSION['user_upload_password'] = $_POST['upload_password']; + } else { + $_SESSION['admin_auth'] = false; + jirafeau_fatal_error(t('BAD_PSW'), $cfg); + } } - else - { - /* h because 'h' looks like a jirafeau ;) */ - $link .= 'file.php?h='.$res['link']; - $delete_link .= - 'file.php?h='.$res['link'].'&d='.$res['delete_link']; + + // Show login form if user session is not authorized yet + if (true === empty($_SESSION['upload_auth'])) { + ?> + + +
+

+ +
+

+ + +

+ + +

+
+ + +
+

+ +

+ + +

+
+ + +
+

+ +

+ + +

+
+ +
+

+ +

+ + +

+
+ +
+

:

+

+
+
+ +
+

+ +

+
+
+

+
- echo '
'.NL; - echo '

' . t('File uploaded! Copy the following URL to get it') . - ':
' . NL; - echo ''.$link.'' . NL; +

+
- if ($time != JIRAFEAU_INFINITY) - { - echo '
' . t('This file is valid until the following date') . - ':
' . strftime ('%c', $time) . ''; +
+
+ + + +

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

- echo '

'; +
+ + '; + echo ''; + } + ?> + + + + + + + + - echo '
' . NL; - echo '

' . t('Keep the following URL to delete it at any moment') . ':
' . NL; - echo '' . $delete_link . '' . NL; - echo '

'; - } -} + = 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 '

'; + } + ?> -if (has_error ()) - show_errors (); - -if (!has_error () && $writable) -{ - ?>
-
-

-

+

+ + + + + + -


-

-

+
' . t('ONE_TIME_DL') . ':
+
-require (JIRAFEAU_ROOT.'lib/template/footer.php'); -?> + +
+ + +
+ + +
+ + +