git.p6c8.net
/
jirafeau.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Translated using Weblate (Polish)
[jirafeau.git]
/
index.php
diff --git
a/index.php
b/index.php
index 7c24e3bb7b7103b9e5ef0ee401c1dca463ff7cf6..11205a4588d3d0dcb0d0a0a96236bd7e43a10ed0 100644
(file)
--- 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. */
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();
if (jirafeau_has_upload_password($cfg)) {
session_start();
- /
* Unlog if asked. */
+ /
/ Logout action
if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
session_unset();
}
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;
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>';
- 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'])
) {
?>
?>
- <form method="post">
+ <form method="post"
class="form login"
>
<fieldset>
<table>
<tr>
<fieldset>
<table>
<tr>
@@
-88,12
+86,11
@@
if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) ||
require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
- } else {
- echo '<div class="error"><p>' . t('Access denied') . '</p></div>';
- require(JIRAFEAU_ROOT.'lib/template/footer.php');
- exit;
}
}
-}
+}
+else {
+ jirafeau_fatal_error(t('Access denied'), $cfg);
+}
?>
<div id="upload_finished">
?>
<div id="upload_finished">
@@
-101,32
+98,38
@@
if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) ||
<div id="upload_finished_download_page">
<p>
<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>
- <p><a id="upload_link" href=""></a></p>
</div>
<?php if ($cfg['preview'] == true) {
?>
<div id="upload_finished_preview">
</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
} ?>
<div id="upload_direct_download">
</div>
<?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>
- <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>
- <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>
<p><?php echo t('This file is valid until the following date'); ?>:</p>
<p id="date"></p>
</div>
@@
-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 = '';
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>
"/>
</p>
</table>
@@
-248,7
+251,7
@@
if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) ||
<?php
if (jirafeau_has_upload_password($cfg)) {
?>
<?php
if (jirafeau_has_upload_password($cfg)) {
?>
- <form method="post">
+ <form method="post"
class="form logout"
>
<input type = "hidden" name = "action" value = "logout"/>
<input type = "submit" value = "<?php echo t('Logout'); ?>" />
</form>
<input type = "hidden" name = "action" value = "logout"/>
<input type = "submit" value = "<?php echo t('Logout'); ?>" />
</form>
@@
-269,5
+272,10
@@
if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($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();
?>';
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'); ?>
</script>
<?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>
patrick-canterino.de