When using download_form, passing query parameters through the action…

… attribute does not work in IE or FF.
pydio · Jun 14, 2014 · a266359 · a266359
1 parent 6397bed
commit a266359
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/core/src/plugins/access.fs/fsActions.xml b/core/src/plugins/access.fs/fsActions.xml
@@ -140,11 +140,18 @@
 							downloadUrl = userSelection.updateFormOrUrl(null,downloadUrl);
 							document.location.href=downloadUrl;
 						}else{
+                            var regex = new RegExp('.*?[&\\?]' + 'minisite_session' + '=(.*?)&.*');
+                            val = window.ajxpServerAccessPath.replace(regex, "$1");
+                            minisite_session = ( val == window.ajxpServerAccessPath ? false : val );
+
 							$('download_form').action = window.ajxpServerAccessPath;
 							$('download_form').secure_token.value = Connexion.SECURE_TOKEN;
 							$('download_form').select("input").each(function(input){
 								if(input.name!='get_action' && input.name!='secure_token') input.remove();
 							});
+							if(minisite_session){
+							    $('download_form').insert(new Element('input', {type:'hidden', name:'minisite_session', value:minisite_session}));
+							}
 							userSelection.updateFormOrUrl($('download_form'));
 							try{
     							$('download_form').submit();

diff --git a/core/src/plugins/action.powerfs/class.PowerFSController.php b/core/src/plugins/action.powerfs/class.PowerFSController.php
@@ -73,6 +73,10 @@ public function switchAction($action, $httpVars, $fileVars)
                     } else {
                         $archiveName =  $httpVars["archive_name"];
                         $jsCode = "
+                            var regex = new RegExp('.*?[&\\?]' + 'minisite_session' + '=(.*?)&.*');
+                            val = window.ajxpServerAccessPath.replace(regex, \"\$1\");
+                            minisite_session = ( val == window.ajxpServerAccessPath ? false : val );
+
                             $('download_form').action = window.ajxpServerAccessPath;
                             $('download_form').secure_token.value = window.Connexion.SECURE_TOKEN;
                             $('download_form').select('input').each(function(input){
@@ -81,6 +85,7 @@ public function switchAction($action, $httpVars, $fileVars)
                             $('download_form').insert(new Element('input', {type:'hidden', name:'ope_id', value:'".$httpVars["ope_id"]."'}));
                             $('download_form').insert(new Element('input', {type:'hidden', name:'archive_name', value:'".$archiveName."'}));
                             $('download_form').insert(new Element('input', {type:'hidden', name:'get_action', value:'postcompress_download'}));
+                            if(minisite_session) $('download_form').insert(new Element('input', {type:'hidden', name:'minisite_session', value:minisite_session}));
                             $('download_form').submit();
                             $('download_form').get_action.value = 'download';
                         ";

diff --git a/core/src/plugins/action.powerfs/manifest.xml b/core/src/plugins/action.powerfs/manifest.xml
@@ -82,12 +82,19 @@
                                     conn.sendAsync();
 
                                 }else{
+                                    var regex = new RegExp('.*?[&\\?]' + 'minisite_session' + '=(.*?)&.*');
+                                    val = window.ajxpServerAccessPath.replace(regex, "$1");
+                                    minisite_session = ( val == window.ajxpServerAccessPath ? false : val );
+
                                     $('download_form').action = window.ajxpServerAccessPath;
                                     $('download_form').secure_token.value = Connexion.SECURE_TOKEN;
                                     $('download_form').select("input").each(function(input){
                                         if(input.name!='get_action' && input.name!='secure_token') input.remove();
                                         if(input.name=='get_action') input.value = 'download';
                                     });
+                                    if(minisite_session){
+                                        $('download_form').insert(new Element('input', {type:'hidden', name:'minisite_session', value:minisite_session}));
+                                    }
                                     userSelection.updateFormOrUrl($('download_form'));
                                     $('download_form').submit();
                                 }