URL encode fix

diff --git a/share/http/js/functions.js b/share/http/js/functions.js
index 9dbf7d95e54fcb523667310236d7e6d9d4794f0e..a04bb360ab5d20533d05c95b131d30673858c257 100644 (file)
--- a/share/http/js/functions.js
+++ b/share/http/js/functions.js
@@ -287,7 +287,7 @@ function in_play()
     var input = value('input_mrl');
     if( value('sout_mrl') != '' )
         input += ' '+value('sout_mrl');
-    var url = 'requests/status.xml?command=in_play&input='+escape( input );
+    var url = 'requests/status.xml?command=in_play&input='+encodeURIComponent( input );
     loadXMLDoc( url, parse_status );
     setTimeout( 'update_playlist()', 1000 );
 }
@@ -296,7 +296,7 @@ function in_enqueue()
     var input = value('input_mrl');
     if( value('sout_mrl') != '' )
         input += ' '+value('sout_mrl');
-    var url = 'requests/status.xml?command=in_enqueue&input='+escape( input );
+    var url = 'requests/status.xml?command=in_enqueue&input='+encodeURIComponent( input );
     loadXMLDoc( url, parse_status );
     setTimeout( 'update_playlist()', 1000 );
 }
@@ -1022,7 +1022,7 @@ function browse( dest )
 function browse_dir( dir )
 {
     document.getElementById( 'browse_lastdir' ).value = dir;
-    loadXMLDoc( 'requests/browse.xml?dir='+escape(dir), parse_browse_dir );
+    loadXMLDoc( 'requests/browse.xml?dir='+encodeURIComponent(dir), parse_browse_dir );
 }
 function browse_path( p )
 {

diff --git a/share/http/js/vlm.js b/share/http/js/vlm.js
index 120fddc07f74d02517657968f1264c7a87d7f8d8..b38fe07a93937e000c437629cbc18c29703cf6af 100644 (file)
--- a/share/http/js/vlm.js
+++ b/share/http/js/vlm.js
@@ -635,7 +635,7 @@ function parse_vlm_elements()
 
 function vlm_cmd( cmd )
 {
-    loadXMLDoc( 'requests/vlm_cmd.xml?command='+cmd.replace(/\#/g, '%23'), parse_vlm_cmd );
+    loadXMLDoc( 'requests/vlm_cmd.xml?command='+encodeURIComponent(cmd), parse_vlm_cmd );
 }
 
 function vlm_get_elements( )