Fix minisite_session parameter management

pydio · Jun 14, 2014 · 706eddc · 706eddc
1 parent 5a01be8
commit 706eddc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/core/src/plugins/access.fs/fsActions.xml b/core/src/plugins/access.fs/fsActions.xml
@@ -142,7 +142,7 @@
 						}else{
                             var regex = new RegExp('.*?[&\\?]' + 'minisite_session' + '=(.*?)&.*');
                             val = window.ajxpServerAccessPath.replace(regex, "$1");
-                            minisite_session = ( val == window.ajxpServerAccessPath ? false : val );
+                            var minisite_session = ( val == window.ajxpServerAccessPath ? false : val );
 
 							$('download_form').action = window.ajxpServerAccessPath;
 							$('download_form').secure_token.value = Connexion.SECURE_TOKEN;

diff --git a/core/src/plugins/action.powerfs/class.PowerFSController.php b/core/src/plugins/action.powerfs/class.PowerFSController.php
@@ -75,7 +75,7 @@ public function switchAction($action, $httpVars, $fileVars)
                         $jsCode = "
                             var regex = new RegExp('.*?[&\\?]' + 'minisite_session' + '=(.*?)&.*');
                             val = window.ajxpServerAccessPath.replace(regex, \"\$1\");
-                            minisite_session = ( val == window.ajxpServerAccessPath ? false : val );
+                            var minisite_session = ( val == window.ajxpServerAccessPath ? false : val );
 
                             $('download_form').action = window.ajxpServerAccessPath;
                             $('download_form').secure_token.value = window.Connexion.SECURE_TOKEN;

diff --git a/core/src/plugins/action.powerfs/manifest.xml b/core/src/plugins/action.powerfs/manifest.xml
@@ -84,7 +84,7 @@
                                 }else{
                                     var regex = new RegExp('.*?[&\\?]' + 'minisite_session' + '=(.*?)&.*');
                                     val = window.ajxpServerAccessPath.replace(regex, "$1");
-                                    minisite_session = ( val == window.ajxpServerAccessPath ? false : val );
+                                    var minisite_session = ( val == window.ajxpServerAccessPath ? false : val );
 
                                     $('download_form').action = window.ajxpServerAccessPath;
                                     $('download_form').secure_token.value = Connexion.SECURE_TOKEN;

diff --git a/core/src/plugins/editor.browser/class.BrowserOpener.js b/core/src/plugins/editor.browser/class.BrowserOpener.js
@@ -37,8 +37,8 @@ Class.create("BrowserOpener", AbstractEditor, {
             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());
+        //var nonSecureAccessPath = window.ajxpServerAccessPath.substring(0, window.ajxpServerAccessPath.lastIndexOf('?'));
+        var open_file_url = url + "/" + window.ajxpServerAccessPath + "&get_action=open_file&repository_id=" + repo + "&file=" + encodeURIComponent(node.getPath());
 
         if(this.editorOptions.context.__className == 'Modal'){
             var myRef = window.open(open_file_url);