X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/71e621e81a096fce132f70ee3918279cc71dd23f..543ffeeaee9f237a7d5cb5b69b4bcc469ea9ecf8:/index.php diff --git a/index.php b/index.php index 7c24e3b..11205a4 100644 --- a/index.php +++ b/index.php @@ -34,35 +34,33 @@ if (has_error()) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); /* Check if user is allowed to upload. */ -if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) || - count($cfg['upload_ip']) == 0) { - - /* Ask password if upload password is set. */ +// 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. */ + // Logout action if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { session_unset(); } - /* Auth. */ + // 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; - echo '

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

'; - require(JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; + jirafeau_fatal_error(t('Wrong password.'), $cfg); } } - /* Show auth page. */ - if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) { + // Show login form if user session is not authorized yet + if (true === empty($_SESSION['upload_auth'])) { ?> -
+
@@ -88,12 +86,11 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) || require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } - } else { - echo '

' . t('Access denied') . '

'; - require(JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; } -} +} +else { + jirafeau_fatal_error(t('Access denied'), $cfg); +} ?>
@@ -101,32 +98,38 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) ||

- - + + +

-

-

:

-

+

+ + +

-

:

-

+

+ + +

-
-

:

-

+
+

+ + +

-
+

:

@@ -239,7 +242,7 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) || onclick=" document.getElementById('upload').style.display = 'none'; document.getElementById('uploading').style.display = ''; - upload ('', ); + upload (); "/>

@@ -248,7 +251,7 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) || - + @@ -269,5 +272,10 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) || document.getElementById('max_file_size').innerHTML = ''; + + addCopyListener('upload_link_button', 'upload_link'); + addCopyListener('preview_link_button', 'preview_link'); + addCopyListener('direct_link_button', 'direct_link'); + addCopyListener('delete_link_button', 'delete_link');