[TASK] Set back plain text URL of links

closes #157

Signed-off-by: Jerome Jutteau <j.jutteau@gmail.com>
This commit is contained in:
Jerome Jutteau 2018-02-09 22:13:53 +01:00 committed by Mojo
parent b8f28b533e
commit b2186ae902
2 changed files with 14 additions and 1 deletions

View File

@ -99,6 +99,8 @@ else {
<p>
<a id="upload_link" href=""><?php echo t('Download page') ?></a>
<a id="upload_link_email" href=""><img id="upload_image_email"/></a>
</p><p>
<code id=upload_link_text></code>
<button id="upload_link_button"></button>
</p>
</div>
@ -108,6 +110,8 @@ else {
<div id="upload_finished_preview">
<p>
<a id="preview_link" href=""><?php echo t('View link') ?></a>
</p><p>
<code id=preview_link_text></code>
<button id="preview_link_button"></button>
</p>
</div>
@ -117,6 +121,8 @@ else {
<div id="upload_direct_download">
<p>
<a id="direct_link" href=""><?php echo t('Direct download link') ?></a>
</p><p>
<code id=direct_link_text></code>
<button id="direct_link_button"></button>
</p>
</div>
@ -124,6 +130,8 @@ else {
<div id="upload_delete">
<p>
<a id="delete_link" href=""><?php echo t('Delete link') ?></a>
</p><p>
<code id=delete_link_text></code>
<button id="delete_link_button"></button>
</p>
</div>

View File

@ -26,6 +26,7 @@ require(JIRAFEAU_ROOT . 'lib/settings.php');
require(JIRAFEAU_ROOT . 'lib/functions.php');
require(JIRAFEAU_ROOT . 'lib/lang.php');
?>
var web_root = "<?php echo $cfg['web_root']; ?>";
function translate (expr)
{
@ -130,12 +131,13 @@ function show_link (reference, delete_code, crypt_key, date)
if (!!document.getElementById('upload_finished_download_page'))
{
document.getElementById('upload_link').href = download_link_href;
document.getElementById('upload_link_text').innerHTML = web_root + download_link_href;
}
// Email link
var filename = document.getElementById('file_select').files[0].name;
var b = encodeURIComponent("Download file \"" + filename + "\":") + "%0D";
b += encodeURIComponent("<?php echo $cfg['web_root']; ?>" + download_link_href) + "%0D";
b += encodeURIComponent(web_root + download_link_href) + "%0D";
if (false == isEmpty(date))
{
b += "%0D" + encodeURIComponent("This file will be available until " + date.format('YYYY-MM-DD hh:mm (GMT O)')) + "%0D";
@ -145,6 +147,7 @@ function show_link (reference, delete_code, crypt_key, date)
// Delete link
var delete_link_href = 'f.php?h=' + reference + '&d=' + delete_code;
document.getElementById('delete_link').href = delete_link_href;
document.getElementById('delete_link_text').innerHTML = web_root + delete_link_href;
// Validity date
if (isEmpty(date))
@ -177,6 +180,7 @@ function show_link (reference, delete_code, crypt_key, date)
type.indexOf("video") > -1)
{
document.getElementById('preview_link').href = preview_link_href;
document.getElementById('preview_link_text').innerHTML = web_root + preview_link_href;
document.getElementById('upload_finished_preview').style.display = '';
}
}
@ -188,6 +192,7 @@ function show_link (reference, delete_code, crypt_key, date)
direct_download_link_href += '&k=' + crypt_key;
}
document.getElementById('direct_link').href = direct_download_link_href;
document.getElementById('direct_link_text').innerHTML = web_root + direct_download_link_href;
// Hide preview and direct download link if password is set
if (document.getElementById('input_key').value.length > 0)