X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/af7e43a4a3bbcb62912eabd75537480bf696b265..f59f39f5ecae40b15bd39d43a59e73198ed4820e:/index.php diff --git a/index.php b/index.php index 2002ad7..7ce9532 100644 --- a/index.php +++ b/index.php @@ -18,86 +18,78 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); +define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); -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'); -check_errors ($cfg); -if (has_error ()) -{ - show_errors (); - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); +check_errors($cfg); +if (has_error()) { + show_errors(); + require(JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } -require (JIRAFEAU_ROOT . 'lib/template/header.php'); +require(JIRAFEAU_ROOT . 'lib/template/header.php'); /* Check if user is allowed to upload. */ -if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg))) -{ - echo '

' . t('Access denied') . '

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; -} - -/* Ask password if upload password is set. */ -if (jirafeau_has_upload_password ($cfg)) -{ - session_start(); +// First check: Challenge by IP +if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { + // Is an upload password required? + if (jirafeau_has_upload_password($cfg)) { + session_start(); - /* Unlog if asked. */ - if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) - session_unset (); + // Logout action + if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + session_unset(); + } - /* Auth. */ - 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']; + // 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('Wrong password.'), $cfg); + } } - else - { - $_SESSION['admin_auth'] = false; - echo '

' . t('Wrong password.') . '

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); + + // Show login form if user session is not authorized yet + if (true === empty($_SESSION['upload_auth'])) { + ?> +
+
+ + + + + + + + + +
+ +
+
+
+ -
-
- - - - - - - - - -
- -
-
-
- @@ -112,24 +104,26 @@ if (jirafeau_has_upload_password ($cfg))

- +

:

- +

:

-
+

:

-
+

:

@@ -137,7 +131,7 @@ if (jirafeau_has_upload_password ($cfg))

- +

@@ -154,7 +148,7 @@ if (jirafeau_has_upload_password ($cfg))

')"/> + onchange="control_selected_file_size(, '')"/>

@@ -206,59 +200,57 @@ if (jirafeau_has_upload_password ($cfg)) ) ); foreach ($expirationTimeOptions as $expirationTimeOption) { - $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : ''; - if(true === $cfg['availabilities'][$expirationTimeOption['value']]) { - echo ''; - } + } } ?> 0) - { - echo '

' . t ('File size is limited to'); - echo " " . $cfg['maximal_upload_size'] . " MB

"; + if ($cfg['maximal_upload_size'] > 0) { + echo '

' . t('File size is limited to'); + echo " " . $cfg['maximal_upload_size'] . " MB

"; } ?>

+ if (jirafeau_has_upload_password($cfg) && $_SESSION['upload_auth']) { + ?> + + } else { + ?>

-
+ if (jirafeau_has_upload_password($cfg)) { + ?> +
@@ -272,7 +264,7 @@ if (jirafeau_has_upload_password ($cfg)) document.getElementById('send').style.display = 'none'; if (!check_html5_file_api ()) document.getElementById('max_file_size').innerHTML = ''; - +