MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refix publicfiles sharing for folder based domains #6406 

Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458 2024-10-01 11:47:41 +01:00
parent 4848df4faf
commit 952bcde25f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/default-mobile.handlebars
View File

@ -2694,7 +2694,7 @@
d3filetreelocation2.push(d3filetreelocation[i]); d3filetreelocation2.push(d3filetreelocation[i]);
if ((folderdepth == 1)) { if ((folderdepth == 1)) {
var sp = d3filetreelocation[i].split('/'); var sp = d3filetreelocation[i].split('/');
publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2]; publicPath = window.location.origin + domainUrl + sp[0] + 'files/' + sp[2];
if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); } if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); }
} else { } else {
if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } } if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } }
@ -2788,7 +2788,7 @@
fullPath += ' / ' + filetreelocation[i]; fullPath += ' / ' + filetreelocation[i];
if ((folderdepth == 1)) { if ((folderdepth == 1)) {
var sp = filetreelocation[i].split('/'); var sp = filetreelocation[i].split('/');
publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2]; publicPath = window.location.origin + domainUrl + sp[0] + 'files/' + sp[2];
//if (filetreelocation[i] === userinfo._id) { filetreelinkpath += 'self'; } else { filetreelinkpath += (sp[0] + '/' + sp[2]); } //if (filetreelocation[i] === userinfo._id) { filetreelinkpath += 'self'; } else { filetreelinkpath += (sp[0] + '/' + sp[2]); }
filetreelinkpath += filetreelocation[i]; filetreelinkpath += filetreelocation[i];
} else { } else {

4
views/default.handlebars
View File

@ -14750,7 +14750,7 @@
fullPath += ' / ' + filetreelocation[i]; fullPath += ' / ' + filetreelocation[i];
if ((folderdepth == 1)) { if ((folderdepth == 1)) {
var sp = filetreelocation[i].split('/'); var sp = filetreelocation[i].split('/');
publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2]; publicPath = window.location.origin + domainUrl + sp[0] + 'files/' + sp[2];
//if (filetreelocation[i] === userinfo._id) { filetreelinkpath += 'self'; } else { filetreelinkpath += (sp[0] + '/' + sp[2]); } //if (filetreelocation[i] === userinfo._id) { filetreelinkpath += 'self'; } else { filetreelinkpath += (sp[0] + '/' + sp[2]); }
filetreelinkpath += filetreelocation[i]; filetreelinkpath += filetreelocation[i];
} else { } else {
@ -17415,7 +17415,7 @@
d3filetreelocation2.push(d3filetreelocation[i]); d3filetreelocation2.push(d3filetreelocation[i]);
if ((folderdepth == 1)) { if ((folderdepth == 1)) {
var sp = d3filetreelocation[i].split('/'); var sp = d3filetreelocation[i].split('/');
publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2]; publicPath = window.location.origin + domainUrl + sp[0] + 'files/' + sp[2];
if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); } if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); }
} else { } else {
if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } } if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } }