Make sure to handle the "BASE" tag instead of document.location.href,…

… should be an util function - Fix 404 for opening images in external window.
pydio · Feb 5, 2014 · b508219 · b508219
1 parent 959a87c
commit b508219
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/src/plugins/editor.browser/class.BrowserOpener.js b/core/src/plugins/editor.browser/class.BrowserOpener.js
@@ -33,6 +33,10 @@ Class.create("BrowserOpener", AbstractEditor, {
         var loc = document.location.href;
         if(loc.indexOf("?") !== -1) loc = loc.substring(0, loc.indexOf("?"));
         var url = loc.substring(0, loc.lastIndexOf('/'));
+        if($$('base').length){
+            url = $$("base")[0].getAttribute("href");
+            if(url.substr(-1) == '/') url = url.substr(0, url.length - 1);
+        }
         var nonSecureAccessPath = ajxpServerAccessPath.substring(0, ajxpServerAccessPath.lastIndexOf('?'));
         var open_file_url = url + "/" + nonSecureAccessPath + "?get_action=open_file&repository_id=" + repo + "&file=" + encodeURIComponent(node.getPath());
 

diff --git a/core/src/plugins/uploader.jumploader/jumploader_tpl.html b/core/src/plugins/uploader.jumploader/jumploader_tpl.html
@@ -103,8 +103,8 @@
 						height="400" \
 						mayscript> \
 					<param name="gc_loggingLevel" value="ERROR"/> \
-					<param name="uc_uploadUrl" value="'+ document.location.href.split("?").shift() + '?secure_token=' + parent.Connexion.SECURE_TOKEN  +'&get_action=upload"/> \
-					<param name="uc_resumeCheckUrl" value="'+ document.location.href.split("?").shift() + '?secure_token=' + parent.Connexion.SECURE_TOKEN  +'&get_action=upload"/> \
+					<param name="uc_uploadUrl" value="'+ document.location.href.split("?").shift().replace('index_shared.php', 'index.php') + '?secure_token=' + parent.Connexion.SECURE_TOKEN  +'&get_action=upload"/> \
+					<param name="uc_resumeCheckUrl" value="'+ document.location.href.split("?").shift().replace('index_shared.php', 'index.php') + '?secure_token=' + parent.Connexion.SECURE_TOKEN  +'&get_action=upload"/> \
 					<param name="uc_fileParameterName" value="userfile_0"/> \
 					<param name="ac_fireUploaderStatusChanged" value="true"/> \
 					<param name="ac_fireAppletInitialized" value="true"/> \