mirror_php/Jirafeau
1
0
Fork 0
mirror of https://gitlab.com/mojo42/Jirafeau.git synced 2025-04-22 12:36:17 +02:00
Code Issues Projects Releases Wiki Activity

lib: simplify link deisplay function

Browse Source 
why this was so complicated ?

Signed-off-by: Jerome Jutteau <mojo@couak.net>
This commit is contained in:
Jerome Jutteau 2015-04-25 11:21:49 +02:00
parent 3074ed828f
commit 05833d4c31
3 changed files with 38 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index.php
View File

@ -103,12 +103,6 @@ if (jirafeau_has_upload_password ($cfg))
<br />
</div>
<div id="upload_password_page">
<p><?php echo t('Download page') ?>:</p>
<p><a id="password_link" href=""></a></p>
<br />
</div>
<?php if ($cfg['preview'] == true) { ?>
<div id="upload_finished_preview">
<p><?php echo t('View link') ?>:</p>

80
lib/functions_v4.js → lib/functions_v5.js
View File

@ -18,7 +18,13 @@
function show_link (url, reference, delete_code, crypt_key, date)
{
// Download page if element exists
// Upload finished
document.getElementById('uploading').style.display = 'none';
document.getElementById('upload').style.display = 'none';
document.getElementById('upload_finished').style.display = '';
document.title = 'Jirafeau - 100%';
// Download page
var download_link = url + 'f.php?h=' + reference;
var download_link_href = url + 'f.php?h=' + reference;
if (crypt_key.length > 0)
@ -32,7 +38,22 @@ function show_link (url, reference, delete_code, crypt_key, date)
document.getElementById('upload_link').href = download_link_href;
}
// Is the preview allowed ?
// Delete link
var delete_link = url + 'f.php?h=' + reference + '&amp;d=' + delete_code;
var delete_link_href = url + 'f.php?h=' + reference + '&d=' + delete_code;
document.getElementById('delete_link').innerHTML = delete_link;
document.getElementById('delete_link').href = delete_link_href;
// Validity date
if (date)
{
document.getElementById('date').innerHTML = date;
document.getElementById('validity').style.display = '';
}
else
document.getElementById('validity').style.display = 'none';
// Preview link (if allowed)
if (!!document.getElementById('preview_link'))
{
document.getElementById('upload_finished_preview').style.display = 'none';
@ -57,52 +78,25 @@ function show_link (url, reference, delete_code, crypt_key, date)
}
}
// Only show link to password page if password is set
document.getElementById('upload_password_page').style.display = 'none';
// Direct download link
var direct_download_link = url + 'f.php?h=' + reference + '&amp;d=1';
var direct_download_link_href = url + 'f.php?h=' + reference + '&d=1';
if (crypt_key.length > 0)
{
direct_download_link += '&amp;k=' + crypt_key;
direct_download_link_href += '&k=' + crypt_key;
}
document.getElementById('direct_link').innerHTML = direct_download_link;
document.getElementById('direct_link').href = direct_download_link_href;
// Hide preview and direct download link if password is set
if (document.getElementById('input_key').value.length > 0)
{
if (!!document.getElementById('upload_finished_download_page'))
document.getElementById('upload_finished_download_page').style.display = 'none';
document.getElementById('upload_password_page').style.display = '';
if (!!document.getElementById('upload_finished_preview'))
if (!!document.getElementById('preview_link'))
document.getElementById('upload_finished_preview').style.display = 'none';
document.getElementById('upload_direct_download').style.display = 'none';
document.getElementById('password_link').innerHTML = download_link;
document.getElementById('password_link').href = download_link_href;
}
// Direct download link
else
{
var direct_download_link = url + 'f.php?h=' + reference + '&amp;d=1';
var direct_download_link_href = url + 'f.php?h=' + reference + '&d=1';
if (crypt_key.length > 0)
{
direct_download_link += '&amp;k=' + crypt_key;
direct_download_link_href += '&k=' + crypt_key;
}
document.getElementById('direct_link').innerHTML = direct_download_link;
document.getElementById('direct_link').href = direct_download_link_href;
}
// Delete link
var delete_link = url + 'f.php?h=' + reference + '&amp;d=' + delete_code;
var delete_link_href = url + 'f.php?h=' + reference + '&d=' + delete_code;
document.getElementById('delete_link').innerHTML = delete_link;
document.getElementById('delete_link').href = delete_link_href;
if (date)
{
document.getElementById('date').innerHTML = date;
document.getElementById('validity').style.display = '';
}
else
document.getElementById('validity').style.display = 'none';
document.getElementById('uploading').style.display = 'none';
document.getElementById('upload').style.display = 'none';
document.getElementById('upload_finished').style.display = '';
document.title = 'Jirafeau - 100%';
}
function show_upload_progression (percentage, speed, time_left)

2
lib/template/header.php
View File

@ -35,6 +35,6 @@ else
<link href="<?php echo $web_root . 'media/' . $style . '/style.css.php'; ?>" rel="stylesheet" type="text/css" />
</head>
<body>
<script language="Javascript" src="lib/functions_v4.js"></script>
<script language="Javascript" src="lib/functions_v5.js"></script>
<div id="content">
<h1><a href="<?php echo $web_root; ?>"><?php echo t('Jirafeau, your web file repository'); ?></a></h1>