Skip to content

V
vlc
Commit c64b6382 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Backport [15236] and [15237]

parent cdf246d7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
share/http/js/functions.js
View file @ c64b6382
...@@ -287,7 +287,7 @@ function in_play() ...@@ -287,7 +287,7 @@ function in_play()
var input = value('input_mrl'); var input = value('input_mrl');
if( value('sout_mrl') != '' ) if( value('sout_mrl') != '' )
input += ' '+value('sout_mrl'); input += ' '+value('sout_mrl');
var url = 'requests/status.xml?command=in_play&input='+encodeURIComponent( input ); var url = 'requests/status.xml?command=in_play&input='+encodeURIComponent( addslashes(escapebackslashes(input)) );
loadXMLDoc( url, parse_status ); loadXMLDoc( url, parse_status );
setTimeout( 'update_playlist()', 1000 ); setTimeout( 'update_playlist()', 1000 );
} }
...@@ -296,7 +296,7 @@ function in_enqueue() ...@@ -296,7 +296,7 @@ function in_enqueue()
var input = value('input_mrl'); var input = value('input_mrl');
if( value('sout_mrl') != '' ) if( value('sout_mrl') != '' )
input += ' '+value('sout_mrl'); input += ' '+value('sout_mrl');
var url = 'requests/status.xml?command=in_enqueue&input='+encodeURIComponent( input ); var url = 'requests/status.xml?command=in_enqueue&input='+encodeURIComponent( addslashes(escapebackslashes(input)) );
loadXMLDoc( url, parse_status ); loadXMLDoc( url, parse_status );
setTimeout( 'update_playlist()', 1000 ); setTimeout( 'update_playlist()', 1000 );
} }
......
share/http/requests/status.xml
View file @ c64b6382
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
<!-- input commands --> <!-- input commands -->
<vlc id="if" param1="command value 'in_play' strcmp 0 =" /> <vlc id="if" param1="command value 'in_play' strcmp 0 =" />
<vlc id="rpn" param1="input value dup playlist_add vlc_play" /> <vlc id="rpn" param1="input value dup stripslashes playlist_add vlc_play" />
<vlc id="end" /> <vlc id="end" />
<vlc id="if" param1="command value 'in_enqueue' strcmp 0 =" /> <vlc id="if" param1="command value 'in_enqueue' strcmp 0 =" />
<vlc id="rpn" param1="input value dup playlist_add" /> <vlc id="rpn" param1="input value dup stripslashes playlist_add" />
<vlc id="end" /> <vlc id="end" />
<!-- playlist commands --> <!-- playlist commands -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment