Commit 89cbc196 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files

add xml_encode to http-control rpn, so status/playlist.xml can be easier

be valid xml without str_replace-stuff.
parent c49d1212
......@@ -370,6 +370,14 @@ void EvaluateRPN( intf_thread_t *p_intf, mvar_t *vars,
SSPush( st, value );
free( value );
}
else if( !strcmp( s, "xml_encode" ) )
{
char *url = SSPop( st );
char *value = convert_xml_special_chars( url );
free( url );
SSPush( st, value );
free( value );
}
else if( !strcmp( s, "addslashes" ) )
{
char *psz_src = SSPop( st );
......
......@@ -35,9 +35,9 @@
<vlc id="end" />
<vlc id="if" param1="pl.type value 'Node' strcmp" />
<vlc id="rpn" param1="1 +" />
<leaf id="<vlc id="value" param1="pl.index" />" <vlc id="if" param1="pl.current" /> current="current" <vlc id="end" /> uri="<vlc id="value" param1="pl.uri value '&' '&amp;' str_replace" />" name="<vlc id="value" param1="pl.name value '&' '&amp;' str_replace" />" ro="<vlc id="value" param1="pl.ro" />" duration="<vlc id="value" param1="pl.duration" />" />
<leaf id="<vlc id="value" param1="pl.index" />" <vlc id="if" param1="pl.current" /> current="current" <vlc id="end" /> uri="<vlc id="value" param1="pl.uri xml_encode" />" name="<vlc id="value" param1="pl.name xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" duration="<vlc id="value" param1="pl.duration" />" />
<vlc id="else" />
<node id="<vlc id="value" param1="pl.index" />" name="<vlc id="value" param1="pl.name value '&' '&amp;' str_replace" />" ro="<vlc id="value" param1="pl.ro" />" >
<node id="<vlc id="value" param1="pl.index" />" name="<vlc id="value" param1="pl.name xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" >
<vlc id="if" param1="first_item value 0 ="/>
<vlc id="rpn" param1="first_item 1 store" />
<vlc id="end"/>
......
......@@ -117,9 +117,9 @@
<repeat><vlc id="value" param1="'repeat' 'VLC_OBJECT_PLAYLIST' vlc_var_get" /></repeat>
<information>
<vlc id="foreach" param1="inf" param2="information" />
<category name="<vlc id="value" param1="inf.name" />">
<category name="<vlc id="value" param1="inf.name xml_encode" />">
<vlc id="foreach" param1="subinf" param2="inf.info" />
<info name="<vlc id="value" param1="subinf.name" />"><vlc id="value" param1="subinf.value" /></info>
<info name="<vlc id="value" param1="subinf.name xml_encode" />"><vlc id="value" param1="subinf.value xml_encode" /></info>
<vlc id="end" />
</category>
<vlc id="end" />
......
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