Fixed files not downloading when & is in name, #4015
Ylian Saint-Hilaire committed
May 19, 2022 at 12:27 UTC
f1f04bef981aa8d449448185a7ee1e0ffbea748c
2 files changed
+3
-14
views/default-mobile.handlebars
+2
-6
@@ -2525,9 +2525,7 @@
2525
for (var i in filetreexx) {
2526
// Figure out the name and shortname
2527
var f = filetreexx[i], name = f.n, shortname;
2528
- shortname = name;
2528
if (name.length > 40) { shortname = EscapeHtml(name.substring(0, 40)) + "..."; } else { shortname = EscapeHtml(name); }
2530
- name = EscapeHtml(name);
2529
2530
// Figure out the date
2531
//var fdatestr = '';
@@ -2540,7 +2538,7 @@
2538
var h = '';
2539
if (f.t < 3 || f.t == 4) {
2540
var right = (f.t == 1 || f.t == 4) ? p5getQuotabar(f) : '';
2543
- h = '<div class=filelist file=999><input file=999 style=float:left name=fc class=fcb type=checkbox onchange=p5setActions() value=\'' + name + '\'> <span style=float:right;padding-right:4px>' + right + '</span><span><div class=fileIcon' + f.t + '></div><a style=cursor:pointer onclick=p5folderset("' + encodeURIComponent(f.nx) + '")>' + shortname + '</a></span></div>';
2541
+ h = '<div class=filelist file=999><input file=999 style=float:left name=fc class=fcb type=checkbox onchange=p5setActions() value=\'' + EscapeHtml(name) + '\'> <span style=float:right;padding-right:4px>' + right + '</span><span><div class=fileIcon' + f.t + '></div><a style=cursor:pointer onclick=p5folderset("' + encodeURIComponent(f.nx) + '")>' + shortname + '</a></span></div>';
2542
} else {
2543
var link = shortname;
2544
var publiclink = '';
@@ -5214,9 +5212,7 @@
5212
for (var i in filetreexx) {
5213
// Figure out the name and shortname
5214
var f = filetreexx[i], name = f.n, shortname;
5217
- shortname = name;
5218
- if (name.length > 70) { shortname = EscapeHtml(name.substring(0, 70)) + "..."; } else { shortname = EscapeHtml(name); }
5219
- name = EscapeHtml(name);
5215
+ if (name.length > 40) { shortname = EscapeHtml(name.substring(0, 70)) + "..."; } else { shortname = EscapeHtml(name); }
5216
5217
// Figure out the size
5218
var fsize = '';
views/default.handlebars
+1
-8
@@ -10249,9 +10249,7 @@
10249
for (var i in filetreexx) {
10250
// Figure out the name and shortname
10251
var f = filetreexx[i], name = f.n, shortname;
10252
- shortname = name;
10252
if (name.length > 70) { shortname = '<span title="' + EscapeHtml(name) + '">' + EscapeHtml(name.substring(0, 70)) + ("..." + '</span>'); } else { shortname = EscapeHtml(name); }
10254
- name = EscapeHtml(name);
10253
10254
// Figure out the date
10255
var fdatestr = '';
@@ -13432,9 +13430,7 @@
13430
for (var i in filetreexx) {
13431
// Figure out the name and shortname
13432
var f = filetreexx[i], name = f.n, shortname;
13435
- shortname = name;
13433
if (name.length > 70) { shortname = '<span title="' + EscapeHtml(name) + '">' + EscapeHtml(name.substring(0, 70)) + "..." + '</span>'; } else { shortname = EscapeHtml(name); }
13437
- name = EscapeHtml(name);
13434
13435
// Figure out the date
13436
var fdatestr = '';
@@ -13447,7 +13443,7 @@
13443
var h = '';
13444
if (f.t < 3 || f.t == 4) {
13445
var right = (f.t == 1 || f.t == 4)?p5getQuotabar(f):'', title = '';
13450
- h = '<div class=filelist file=999><input file=999 style=float:left name=fc class=fcb type=checkbox onchange=p5setActions() value="' + name + '"> <span style=float:right title="' + title + '">' + right + '</span><span><div class=fileIcon' + f.t + ' onclick=p5folderset("' + encodeURIComponentEx(f.nx) + '")></div><a href=# style=cursor:pointer onclick=\'return p5folderset("' + encodeURIComponentEx(f.nx) + '")\'>' + shortname + '</a></span></div>';
13446
+ h = '<div class=filelist file=999><input file=999 style=float:left name=fc class=fcb type=checkbox onchange=p5setActions() value="' + EscapeHtml(name) + '"> <span style=float:right title="' + title + '">' + right + '</span><span><div class=fileIcon' + f.t + ' onclick=p5folderset("' + encodeURIComponentEx(f.nx) + '")></div><a href=# style=cursor:pointer onclick=\'return p5folderset("' + encodeURIComponentEx(f.nx) + '")\'>' + shortname + '</a></span></div>';
13447
} else {
13448
var link = shortname, publiclink = '', loginkey = (urlargs.key)?('&key=' + urlargs.key):'';
13449
if (publicfolder) { publiclink = '<img src="images/link2.png" style=cursor:pointer title="' + "Display public link" + '" onclick=\'return p5showPublicLink("' + (publicPath + '/' + encodeURIComponentEx(f.nx)) + '?download=1' + loginkey + '")\' width=10 height=10 /> <img src="images/link4.png" title="' + "Copy link to clipboard" + '" style="cursor:pointer" onclick=copyTextToClip2("' + encodeURIComponentEx(publicPath + '/' + encodeURIComponentEx(f.nx) + '?download=1' + loginkey) + '") width=10 height=10>'; }
@@ -15916,10 +15912,7 @@
15912
15913
// Filter out files
15914
if ((f.t == 3) && (fileFilter != '') && (f.nx.toLowerCase().endsWith(fileFilter) == false)) { continue; }
15919
-
15920
- shortname = name;
15915
if (name.length > 70) { shortname = '<span title="' + EscapeHtml(name) + '">' + EscapeHtml(name.substring(0, 70)) + ("..." + '</span>'); } else { shortname = EscapeHtml(name); }
15922
- name = EscapeHtml(name);
15916
15917
// Figure out the size
15918
var fsize = '';