From 891db695743a9198ed9217a87c0aead0cd2a4fee Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Sun, 12 Mar 2017 12:13:23 +0000 Subject: [PATCH] Upload legt Verzeichnisse an, wenn sie nicht da sind --- web/ui/ui.js | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index fbceedc..a2b5ce8 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -28,6 +28,9 @@ var cutCopySrcDir; var cutCopyFiles; var cutCopyOperation; +var loc; +var PERS_DIR = "Persoenlich"; +var PUB_DIR = "Oeffentlich"; function fm_init() { $("#mce-editor").hide(); @@ -61,6 +64,14 @@ fm_get_login(); fm_get_list(''); fm_init_uploader(); + /* + console.log('href: ' + window.location.href); + console.log('host: ' + window.location.host); + console.log('hostname: ' + window.location.hostname); + console.log('port: ' + window.location.port); + console.log('protocol: ' + window.location.protocol); + */ + loc = window.location.protocol + '//' + window.location.host; } function fm_resize_editor() { @@ -77,10 +88,10 @@ function fm_get_path(uid) { //console.log('pfad: ' + pfad); var restdir; - if(pfad.indexOf('Oeffentlich') > -1) { - restdir = pfad.substr('Oeffentlich'.length); - } else if(pfad.indexOf('Persoenlicher Ordner') > -1) { - restdir = pfad.substr('Persoenlicher Ordner'.length); + if(pfad.indexOf(PUB_DIR) > -1) { + restdir = pfad.substr(PUB_DIR.length); + } else if(pfad.indexOf(PERS_DIR) > -1) { + restdir = pfad.substr(PERS_DIR.length); } if(restdir !== undefined && restdir.startsWith('/')) { restdir = restdir.substr(1); @@ -97,9 +108,9 @@ function fm_get_base(uid) { //console.log('pfad: ' + pfad); var pdir; - if(pfad.indexOf('Oeffentlich') > -1) { + if(pfad.indexOf(PUB_DIR) > -1) { pdir = '/data/'; - } else if(pfad.indexOf('Persoenlicher Ordner') > -1) { + } else if(pfad.indexOf(PERS_DIR) > -1) { pdir = '/home/'; } //console.log('base: ' + pdir + uid); @@ -895,7 +906,7 @@ ext = fny.substr(dotpos); } var path = fm_get_path(userid); - var imgurl = 'http://localhost:8079' + path + '/' + self.fnx + '_tn' + ext; + var imgurl = loc + path + '/' + self.fnx + '_tn' + ext; return imgurl; }; -- Gitblit v1.9.3