X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/a046e3b04175367c1afadd306513414fa61ba3fd..refs/merge-requests/39/head:/lib/functions.js.php?ds=inline
diff --git a/lib/functions.js.php b/lib/functions.js.php
index 64154d3..c468d18 100644
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -19,12 +19,15 @@
* along with this program. If not, see .
*/
- function template_js_preview_link() {
+function template_js_preview_link()
+{
?>
if (!!document.getElementById('preview_link'))
{
document.getElementById('upload_finished_preview').style.display = 'none';
- var preview_link_href = 'f.php?h=' + reference + '&p=1';
+ var preview_link_href = use_shortlinks ? '' : 'f.php?h=';
+ preview_link_href += reference;
+ preview_link_href += use_shortlinks ? '?p=1' : '&p=1';
if (crypt_key.length > 0)
{
preview_link_href += '&k=' + crypt_key;
@@ -44,14 +47,17 @@
}
}
// Download page
- var download_link_href = 'f.php?h=' + reference;
+ var download_link_href = use_shortlinks ? '' : 'f.php?h=';
+ download_link_href += reference;
if (crypt_key.length > 0)
{
- download_link_href += '&k=' + crypt_key;
+ download_link_href += use_shortlinks ? '?k=' : '&k='
+ download_link_href += crypt_key;
}
if (!!document.getElementById('upload_finished_download_page'))
{
@@ -60,7 +66,8 @@ function template_js_download_page() {
}
// Email link
var b = encodeURIComponent(" \"" + filename + "\":") + "%0D" + "%0A";
@@ -72,18 +79,26 @@ function template_js_email_link() {
}
// Delete link
- var delete_link_href = 'f.php?h=' + reference + '&d=' + delete_code;
+ var delete_link_href = use_shortlinks ? '' : 'f.php?h=';
+ delete_link_href += reference;
+ delete_link_href += use_shortlinks ? '?d=' : '&d=';
+ delete_link_href += delete_code;
document.getElementById('delete_link').href = delete_link_href;
document.getElementById('delete_link_text').innerHTML = web_root + delete_link_href;
// Direct download link
- var direct_download_link_href = 'f.php?h=' + reference + '&d=1';
+ //var direct_download_link_href = 'f.php?h=' + reference + '&d=1';
+ var direct_download_link_href = use_shortlinks ? '' : 'f.php?h=';
+ direct_download_link_href += reference;
+ direct_download_link_href += use_shortlinks ? '?d=1' : '&d=1';
if (crypt_key.length > 0)
{
direct_download_link_href += '&k=' + crypt_key;
@@ -91,8 +106,9 @@ function template_js_delete_link() {
document.getElementById('direct_link').href = direct_download_link_href;
document.getElementById('direct_link_text').innerHTML = web_root + direct_download_link_href;
// Validity date
if (isEmpty(date))
@@ -111,7 +127,7 @@ function template_js_delete_link() {
document.getElementById('date').style.display = '';
}
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
var web_root = "";
+var use_shortlinks = ;
var lang_array = ;
var lang_array_fallback = ;
@@ -329,11 +346,45 @@ function control_selected_file_size(max_size, error_str)
// display options
document.getElementById('options').style.display = 'block';
document.getElementById('send').style.display = 'block';
+ document.getElementById('send').disabled = false;
document.getElementById('error_pop').style.display = 'none';
document.getElementById('send').focus();
}
}
+// UX-only: script.php enforces disallowed_extensions independently, this
+// just warns the user before they submit a doomed upload.
+function control_selected_file_extension(disallowed_extensions, error_str)
+{
+ if (disallowed_extensions.length === 0)
+ {
+ return;
+ }
+ f_name = document.getElementById('file_select').files[0].name.replace(/[\s.]+$/, '').toLowerCase();
+ // suffix match so that compound extensions such as 'tar.gz' work too
+ if (disallowed_extensions.some(function (ext) { return f_name.endsWith('.' + ext); }))
+ {
+ // control_selected_file_size runs first: keep its error, if any, and add ours
+ var error_pop = document.getElementById('error_pop');
+ if (error_pop.style.display === 'none')
+ {
+ pop_failure(error_str);
+ }
+ else
+ {
+ error_pop.innerHTML += '
' + error_str;
+ }
+ // keep the button visible but disabled so the user sees it is forbidden
+ document.getElementById('send').style.display = 'block';
+ document.getElementById('send').disabled = true;
+ document.getElementById('disallowed_extensions').style.display = 'block';
+ }
+ else
+ {
+ document.getElementById('disallowed_extensions').style.display = 'none';
+ }
+}
+
function XHRErrorHandler(e)
{
var text = "${e.type}: ${e.loaded} bytes transferred"
@@ -413,9 +464,9 @@ function classic_upload (file, time, password, one_time)
req.upload.addEventListener ("progress", upload_progress, false);
req.addEventListener ("error", XHRErrorHandler, false);
req.addEventListener ("abort", XHRErrorHandler, false);
- req.onreadystatechange = function ()
+ req.onload = function ()
{
- if (req.readyState == 4 && req.status == 200)
+ if (req.status === 200)
{
var res = req.responseText;
@@ -462,6 +513,13 @@ function classic_upload (file, time, password, one_time)
function check_html5_file_api ()
{
+
+ // Enforce classic upload is enabled through config!
+ return false;
+
return window.File && window.FileReader && window.FileList && window.Blob;
}