Merge pull request #583 from lkho/develop

Added encodeURIComponent() on the file path url for reading mp3
pydio · Oct 27, 2014 · e142570 · e142570
2 parents 9133634 + 8ae63a1
commit e142570
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/core/src/plugins/editor.audio/class.AudioPreviewer.js b/core/src/plugins/editor.audio/class.AudioPreviewer.js
@@ -27,15 +27,16 @@ Class.create("AudioPreviewer", AbstractEditor, {
 
 	getPreview : function(ajxpNode, rich){
 		if(rich){			
-			var escapedFilename = 'base64encoded:'+base64_encode(ajxpNode.getPath());
+			var escapedFilename = encodeURIComponent(base64_encode(ajxpNode.getPath()));
+			var escapedUrl = encodeURIComponent(ajxpBootstrap.parameters.get('ajxpServerAccess')+'&get_action=audio_proxy&file='+escapedFilename);
 			var player = 'dewplayer-bubble.swf';
-			var flashVars = 'mp3='+ajxpBootstrap.parameters.get('ajxpServerAccess')+'%26get_action=audio_proxy%26file='+escapedFilename+'&amp;showtime=1';
+			var flashVars = 'mp3='+escapedUrl+'&showtime=1';
 			var playerWidth = '250';
 			var playerHeight = '65';
 			var containerStyle = 'padding:5 0px; margin-bottom: 5px;';
 			if(!rich){
 				player = 'dewplayer.swf';
-				flashVars = 'mp3='+ajxpBootstrap.parameters.get('ajxpServerAccess')+'%26get_action=audio_proxy%26file='+escapedFilename+'&amp;nopointer=1';
+				flashVars = 'mp3='+escapedUrl+'&nopointer=1';
 				playerWidth = '40';
 				playerHeight = '20';
 				containerStyle = '';				
@@ -75,17 +76,17 @@ Class.create("AudioPreviewer", AbstractEditor, {
 		var template = new Template('<head><title>#{window_title}</title></head><body style="margin:0px; padding:10px;"><div style=\"font-family:Trebuchet MS, sans-serif; color:#79f; font-size:15px; font-weight:bold;\">#{window_title}</div><div style="font-family:Trebuchet MS, sans-serif; color:#666; font-size:10px; padding-bottom: 10px;">#{reading_folder}: #{current_folder}</div><object type="application/x-shockwave-flash" data="plugins/editor.audio/dewplayer-playlist.swf" width="240" height="200"><param name="wmode" value="transparent"><param name="movie" value="plugins/editor.audio/dewplayer-playlist.swf"/><param name="flashvars" value="xml=#{playlist_url}&amp;showtime=true&amp;autoreplay=true&amp;autoplay=true"/></object></body>');
 		var newWin = window.open('#', '_blank', 'width=260,height=270,directories=no,location=no,menubar=no,resizeable=yes,scrollbars=no,status=no,toolbar=no');
 		try{
-			var playlist_url = ajxpBootstrap.parameters.get('ajxpServerAccess')+'%26get_action=ls%26skip_history=true%26playlist=true%26dir='+base64_encode(ajxpNode.getPath());
+			var playlist_url = ajxpBootstrap.parameters.get('ajxpServerAccess')+'&get_action=ls&skip_history=true&playlist=true&dir='+encodeURIComponent(base64_encode(ajxpNode.getPath()));
 			newWin.document.write(template.evaluate({
-				window_title : "Pydio MP3 Player",
+				window_title   : "Pydio MP3 Player",
 				reading_folder : MessageHash[141],
-				playlist_url:playlist_url, 
-				current_folder:ajxpNode.getLabel()
+				playlist_url   : encodeURIComponent(playlist_url),
+				current_folder : ajxpNode.getLabel()
 			}));
 			newWin.document.close();
 		}catch(e){
 			alert(e);
 		}		
 	}
 
-});
+});
diff --git a/core/src/plugins/editor.soundmanager/class.SMPlayer.js b/core/src/plugins/editor.soundmanager/class.SMPlayer.js
@@ -127,7 +127,7 @@ function hookToFilesList(){
         $A(fList.getItems()).each(function(row){
             if(!row.ajxpNode || (row.ajxpNode.getAjxpMime() != "mp3" && row.ajxpNode.getAjxpMime() != "wav")) return;
             addVolumeButton();
-            var url = ajxpBootstrap.parameters.get('ajxpServerAccess')+'&get_action=audio_proxy&file=base64encoded:'+base64_encode(row.ajxpNode.getPath())+ '&fake=extension.'+row.ajxpNode.getAjxpMime();
+            var url = ajxpBootstrap.parameters.get('ajxpServerAccess')+'&get_action=audio_proxy&file='+encodeURIComponent(base64_encode(row.ajxpNode.getPath()))+ '&fake=extension.'+row.ajxpNode.getAjxpMime();
             var player = new Element("div", {className:"ui360 ui360-micro"}).update(new Element("a", {href:url}).update(""));
             row.down("span#ajxp_label").setStyle({backgroundImage:'none'}).insert({top:player});
             threeSixtyPlayer.config.items = [player];
@@ -253,7 +253,7 @@ soundManager.setup({\n\
             return im;
         }
         addVolumeButton();
-        var url = ajxpBootstrap.parameters.get('ajxpServerAccess')+'&get_action=audio_proxy&file=base64encoded:'+base64_encode(ajxpNode.getPath());
+        var url = ajxpBootstrap.parameters.get('ajxpServerAccess')+'&get_action=audio_proxy&file='+encodeURIComponent(base64_encode(ajxpNode.getPath()));
         if(rich){
             url += '&rich_preview=true&fake=extension.'+ajxpNode.getAjxpMime();
         }else{
@@ -325,4 +325,4 @@ soundManager.setup({\n\
 
     }
 
-});
+});