X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/96707e02b8b24054e0827eaf169cc88504a1e78c..d5b85f9c7bda15446c271edf809c4dde150f6f3d:/index.php?ds=inline
diff --git a/index.php b/index.php
index b8feabd..11205a4 100644
--- a/index.php
+++ b/index.php
@@ -34,63 +34,62 @@ 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))) {
- echo '<div class="error"><p>' . t('Access denied') . '</p></div>';
- require(JIRAFEAU_ROOT.'lib/template/footer.php');
- exit;
-}
+// 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();
-/* Ask password if upload password is set. */
-if (jirafeau_has_upload_password($cfg)) {
- session_start();
+ // Logout action
+ if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+ session_unset();
+ }
- /* Unlog if asked. */
- if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
- session_unset();
- }
+ // 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);
+ }
+ }
- /* 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'];
- } else {
- $_SESSION['admin_auth'] = false;
- echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>';
+ // Show login form if user session is not authorized yet
+ if (true === empty($_SESSION['upload_auth'])) {
+ ?>
+ <form method="post" class="form login">
+ <fieldset>
+ <table>
+ <tr>
+ <td class = "label"><label for = "enter_password">
+ <?php echo t('Upload password') . ':'; ?></label>
+ </td>
+ <td class = "field"><input type = "password"
+ name = "upload_password" id = "upload_password"
+ size = "40" />
+ </td>
+ </tr>
+ <tr class = "nav">
+ <td></td>
+ <td class = "nav next">
+ <input type = "submit" name = "key" value =
+ "<?php echo t('Login'); ?>" />
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ </form>
+ <?php
require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
}
-
- /* Show auth page. */
- if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) {
- ?>
- <form action = "<?php echo basename(__FILE__); ?>" method = "post">
- <fieldset>
- <table>
- <tr>
- <td class = "label"><label for = "enter_password">
- <?php echo t('Upload password') . ':'; ?></label>
- </td>
- <td class = "field"><input type = "password"
- name = "upload_password" id = "upload_password"
- size = "40" />
- </td>
- </tr>
- <tr class = "nav">
- <td></td>
- <td class = "nav next">
- <input type = "submit" name = "key" value =
- "<?php echo t('Login'); ?>" />
- </td>
- </tr>
- </table>
- </fieldset>
- </form>
- <?php
- require(JIRAFEAU_ROOT.'lib/template/footer.php');
- exit;
- }
+}
+else {
+ jirafeau_fatal_error(t('Access denied'), $cfg);
}
?>
@@ -99,32 +98,38 @@ if (jirafeau_has_upload_password($cfg)) {
<div id="upload_finished_download_page">
<p>
- <?php echo t('Download page') ?>
- <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
+ <a id="upload_link" href=""><?php echo t('Download page') ?></a>
+ <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
+ <button id="upload_link_button">â</button>
</p>
- <p><a id="upload_link" href=""></a></p>
</div>
<?php if ($cfg['preview'] == true) {
?>
<div id="upload_finished_preview">
- <p><?php echo t('View link') ?>:</p>
- <p><a id="preview_link" href=""></a></p>
+ <p>
+ <a id="preview_link" href=""><?php echo t('View link') ?></a>
+ <button id="preview_link_button">â</button>
+ </p>
</div>
- <?php
+ <?php
} ?>
<div id="upload_direct_download">
- <p><?php echo t('Direct download link') ?>:</p>
- <p><a id="direct_link" href=""></a></p>
+ <p>
+ <a id="direct_link" href=""><?php echo t('Direct download link') ?></a>
+ <button id="direct_link_button">â</button>
+ </p>
</div>
- <div>
- <p><?php echo t('Delete link') ?>:</p>
- <p><a id="delete_link" href=""></a></p>
+ <div id="upload_delete">
+ <p>
+ <a id="delete_link" href=""><?php echo t('Delete link') ?></a>
+ <button id="delete_link_button">â</button>
+ </p>
</div>
- <div id="validity">
+ <div id="upload_validity">
<p><?php echo t('This file is valid until the following date'); ?>:</p>
<p id="date"></p>
</div>
@@ -237,7 +242,7 @@ if (jirafeau_has_upload_password($cfg)) {
onclick="
document.getElementById('upload').style.display = 'none';
document.getElementById('uploading').style.display = '';
- upload ('<?php echo $cfg['web_root']; ?>', <?php echo jirafeau_get_max_upload_size_bytes(); ?>);
+ upload (<?php echo jirafeau_get_max_upload_size_bytes(); ?>);
"/>
</p>
</table>
@@ -246,7 +251,7 @@ if (jirafeau_has_upload_password($cfg)) {
<?php
if (jirafeau_has_upload_password($cfg)) {
?>
- <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+ <form method="post" class="form logout">
<input type = "hidden" name = "action" value = "logout"/>
<input type = "submit" value = "<?php echo t('Logout'); ?>" />
</form>
@@ -267,5 +272,10 @@ if (jirafeau_has_upload_password($cfg)) {
document.getElementById('max_file_size').innerHTML = '<?php
echo t('You browser may not support HTML5 so the maximum file size is ') . jirafeau_get_max_upload_size();
?>';
+
+ addCopyListener('upload_link_button', 'upload_link');
+ addCopyListener('preview_link_button', 'preview_link');
+ addCopyListener('direct_link_button', 'direct_link');
+ addCopyListener('delete_link_button', 'delete_link');
</script>
<?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>