X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/cbef2b93dfeb51484956c960d58af8c4557c25f5..a4111660b05af9df96bbe567aa43acff34b6339d:/index.php?ds=sidebyside
diff --git a/index.php b/index.php
index 7ee8ea2..24565bd 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,130 +16,312 @@
* 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 .
*/
-
+session_start();
define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
-define('DEBUG', true);
-require(JIRAFEAU_ROOT . 'lib/config.php');
require(JIRAFEAU_ROOT . 'lib/settings.php');
require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
-/* check if the destination dirs are writable */
-$writable = is_writable(VAR_FILES) && is_writable(VAR_LINKS) && is_writable(VAR_TRASH);
-
-$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;
- }
-
- $res = jirafeau_upload($_FILES['file'], isset($_POST['one_time_download']), $key, $time, $cfg, $_SERVER['REMOTE_ADDR']);
+if ($cfg['download_password_requirement'] === "generated"){
+ $download_pass = jirafeau_gen_download_pass($cfg['download_password_gen_len'], $cfg['download_password_gen_chars']);
}
+check_errors($cfg);
+if (has_error()) {
+ require(JIRAFEAU_ROOT . 'lib/template/header.php');
+ show_errors();
+ require(JIRAFEAU_ROOT . 'lib/template/footer.php');
+ exit;
+}
require(JIRAFEAU_ROOT . 'lib/template/header.php');
-/* Checking for errors. */
-if(!is_writable(VAR_FILES)) {
- add_error (_('The file directory is not writable!'), VAR_FILES);
+// Logout action
+if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+ jirafeau_session_end();
}
-if(!is_writable(VAR_LINKS)) {
- add_error (_('The link directory is not writable!'), VAR_LINKS);
+/* Check if user is allowed to upload. */
+// First check: Is user already logged
+if (jirafeau_user_session_logged()) {
}
-
-if(!is_writable(VAR_TRASH)) {
- add_error (_('The trash directory is not writable!'), VAR_TRASH);
+// Second check: Challenge by IP NO PASSWORD
+elseif (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
+ jirafeau_user_session_start();
}
+// Third 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)) {
+ // Challenge by password
+ if (isset($_POST['upload_password'])) {
+ if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {
+ jirafeau_user_session_start();
+ } else {
+ jirafeau_session_end();
+ jirafeau_fatal_error(t('BAD_PSW'), $cfg);
+ }
+ }
-/* Check if the install.php script is still in the directory. */
-if (file_exists(JIRAFEAU_ROOT . 'install.php')) {
- add_error (_('Installer script still present'),
- _('Please make sure to delete the installer script "install.php" before continuing.'));
+ // Show login form if user session is not authorized yet
+ if (!jirafeau_user_session_logged()) {
+ ?>
+
+ ' . NL;
- echo '
' . _('File uploaded! Copy the following URL to get it:') . ' ' . NL;
- echo '' . $link . '' . NL;
+?>
+
+
- if($time != JIRAFEAU_INFINITY) {
- echo ' ' . _('This file is valid until the following date:') . ' ' . strftime('%c' ,$time) . '';
- }
+