X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/53517d3b939f85007001beb3a01a32b032a9070b..41f33f9c1dac5381412bcab57c971fd08d1d8613:/index.php?ds=sidebyside
diff --git a/index.php b/index.php
index 62588aa..b6dac09 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,153 +16,284 @@
* 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()) {
+ require(JIRAFEAU_ROOT . 'lib/template/header.php');
+ show_errors();
+ require(JIRAFEAU_ROOT . 'lib/template/footer.php');
exit;
}
+require(JIRAFEAU_ROOT . 'lib/template/header.php');
-/* 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;
- }
-
- $res =
- jirafeau_upload ($_FILES['file'], isset ($_POST['one_time_download']),
- $key, $time, $cfg, $_SERVER['REMOTE_ADDR']);
+// Logout action
+if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+ jirafeau_session_end();
}
-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'];
+/* Check if user is allowed to upload. */
+// First check: Is user already logged
+if (jirafeau_user_session_logged()) {
+}
+// 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);
+ }
}
- 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 (!jirafeau_user_session_logged()) {
+ ?>
+
+ '.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) . '';
- }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- echo '
';
+
- echo '' . NL;
- echo '
' . t('Keep the following URL to delete it at any moment') . ':
' . NL;
- echo '' . $delete_link . '' . NL;
- echo '
';
+
+
+
+
+
+
+
+
+
+
+
+
+
+