refix publicfiles sharing for folder based domains #6406
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
parent
4848df4faf
commit
952bcde25f
|
@ -2694,7 +2694,7 @@
|
|||
d3filetreelocation2.push(d3filetreelocation[i]);
|
||||
if ((folderdepth == 1)) {
|
||||
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]); }
|
||||
} else {
|
||||
if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } }
|
||||
|
@ -2788,7 +2788,7 @@
|
|||
fullPath += ' / ' + filetreelocation[i];
|
||||
if ((folderdepth == 1)) {
|
||||
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]); }
|
||||
filetreelinkpath += filetreelocation[i];
|
||||
} else {
|
||||
|
|
|
@ -14750,7 +14750,7 @@
|
|||
fullPath += ' / ' + filetreelocation[i];
|
||||
if ((folderdepth == 1)) {
|
||||
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]); }
|
||||
filetreelinkpath += filetreelocation[i];
|
||||
} else {
|
||||
|
@ -17415,7 +17415,7 @@
|
|||
d3filetreelocation2.push(d3filetreelocation[i]);
|
||||
if ((folderdepth == 1)) {
|
||||
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]); }
|
||||
} else {
|
||||
if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } }
|
||||
|
|
Loading…
Reference in New Issue