aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Fix: Corrected rendering by means of <<xsl:output>

Browse Source 
Closes: #2396
This commit is contained in:
Philipp Schafft 2020-10-09 09:36:03 +00:00
parent f9217eae35
commit fde951551f
22 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/dashboard.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" xmlns="http://www.w3.org/1999/xhtml"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>
<xsl:variable name="title">Dashboard</xsl:variable> <xsl:variable name="title">Dashboard</xsl:variable>

3
admin/error-html.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" xmlns="http://www.w3.org/1999/xhtml"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:include href="includes/web-page.xsl"/> <xsl:include href="includes/web-page.xsl"/>
<xsl:variable name="title">Error</xsl:variable> <xsl:variable name="title">Error</xsl:variable>

1
admin/fallbacks.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" />
<!-- Import include files --> <!-- Import include files -->
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>
<xsl:include href="includes/mountnav.xsl"/> <xsl:include href="includes/mountnav.xsl"/>

1
admin/includes/footer.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes" />
<xsl:template name="footer"> <xsl:template name="footer">
<div class="footer"> <div class="footer">

1
admin/includes/head.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes" />
<xsl:template name="head"> <xsl:template name="head">
<xsl:param name="title"/> <xsl:param name="title"/>
<head> <head>

1
admin/includes/header.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes" />
<xsl:template name="header"> <xsl:template name="header">
<header> <header>

1
admin/includes/mountnav.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes" />
<xsl:template name="mountnav"> <xsl:template name="mountnav">
<xsl:param name="mount" select="@mount"/> <xsl:param name="mount" select="@mount"/>
<div class="mountnav"> <div class="mountnav">

2
admin/includes/page.xsl
View File

@ -1,5 +1,5 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" /> <xsl:output method="html" doctype-system="about:legacy-compat" encoding="utf-8" />
<!-- Import include files --> <!-- Import include files -->
<xsl:include href="includes/head.xsl"/> <xsl:include href="includes/head.xsl"/>
<xsl:include href="includes/header.xsl"/> <xsl:include href="includes/header.xsl"/>

1
admin/includes/player.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes" />
<xsl:template name="player"> <xsl:template name="player">
<div> <div>
<ul class="playlists"> <ul class="playlists">

1
admin/includes/playlist.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes" />
<xsl:template name="playlist"> <xsl:template name="playlist">
<xsl:if test="playlist/*"> <xsl:if test="playlist/*">
<h4>Playlist</h4> <h4>Playlist</h4>

13
admin/includes/web-page.xsl
View File

@ -1,5 +1,5 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" xmlns="http://www.w3.org/1999/xhtml"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" /> <xsl:output method="html" doctype-system="about:legacy-compat" encoding="utf-8" />
<!-- Import include files --> <!-- Import include files -->
<xsl:template match="/node()"> <xsl:template match="/node()">
@ -15,6 +15,15 @@
<meta name="description" content="Icecast is free server software for streaming multimedia." /> <meta name="description" content="Icecast is free server software for streaming multimedia." />
</head> </head>
<body> <body>
<xsl:text disable-output-escaping="yes">
&lt;!-- WARNING:
DO NOT ATTEMPT TO PARSE ICECAST HTML OUTPUT!
The web interface may change completely between releases.
If you have a need for automatic processing of server data,
please read the appropriate documentation. Latest docs:
https://icecast.org/docs/icecast-latest/icecast2_stats.html
-->
</xsl:text>
<!-- Header and menu --> <!-- Header and menu -->
<header> <header>
<nav id="main-nav" role="primary"> <nav id="main-nav" role="primary">

1
admin/listclients.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes" />
<!-- Import include files --> <!-- Import include files -->
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>
<xsl:include href="includes/mountnav.xsl"/> <xsl:include href="includes/mountnav.xsl"/>

1
admin/listmounts.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" />
<!-- Import include files --> <!-- Import include files -->
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>
<xsl:include href="includes/mountnav.xsl"/> <xsl:include href="includes/mountnav.xsl"/>

1
admin/manageauth.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" />
<!-- Import include files --> <!-- Import include files -->
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>
<xsl:include href="includes/mountnav.xsl"/> <xsl:include href="includes/mountnav.xsl"/>

1
admin/moveclients.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" />
<!-- Import include files --> <!-- Import include files -->
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>
<xsl:include href="includes/mountnav.xsl"/> <xsl:include href="includes/mountnav.xsl"/>

1
admin/response.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" />
<!-- Import include files --> <!-- Import include files -->
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>

3
admin/showlog.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" xmlns="http://www.w3.org/1999/xhtml"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>
<xsl:variable name="title">Logfiles</xsl:variable> <xsl:variable name="title">Logfiles</xsl:variable>

1
admin/stats.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" />
<!-- Import include files --> <!-- Import include files -->
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>
<xsl:include href="includes/mountnav.xsl"/> <xsl:include href="includes/mountnav.xsl"/>

1
admin/updatemetadata.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes" />
<!-- Import include files --> <!-- Import include files -->
<xsl:include href="includes/page.xsl"/> <xsl:include href="includes/page.xsl"/>
<xsl:include href="includes/mountnav.xsl"/> <xsl:include href="includes/mountnav.xsl"/>

3
web/auth.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" xmlns="http://www.w3.org/1999/xhtml"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:include href="includes/web-page.xsl"/> <xsl:include href="includes/web-page.xsl"/>
<xsl:variable name="title">Authorization Page</xsl:variable> <xsl:variable name="title">Authorization Page</xsl:variable>
<xsl:template name="content"> <xsl:template name="content">

3
web/server_version.xsl
View File

@ -1,5 +1,4 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" xmlns="http://www.w3.org/1999/xhtml"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:include href="includes/web-page.xsl"/> <xsl:include href="includes/web-page.xsl"/>
<xsl:variable name="title">Server Information</xsl:variable> <xsl:variable name="title">Server Information</xsl:variable>
<xsl:template name="content"> <xsl:template name="content">

12
web/status.xsl
View File

@ -1,19 +1,9 @@
<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" xmlns="http://www.w3.org/1999/xhtml"> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
<xsl:include href="includes/web-page.xsl"/> <xsl:include href="includes/web-page.xsl"/>
<xsl:include href="includes/player.xsl"/> <xsl:include href="includes/player.xsl"/>
<xsl:include href="includes/playlist.xsl"/> <xsl:include href="includes/playlist.xsl"/>
<xsl:variable name="title">Status</xsl:variable> <xsl:variable name="title">Status</xsl:variable>
<xsl:template name="content"> <xsl:template name="content">
<xsl:text disable-output-escaping="yes">
&lt;!-- WARNING:
DO NOT ATTEMPT TO PARSE ICECAST HTML OUTPUT!
The web interface may change completely between releases.
If you have a need for automatic processing of server data,
please read the appropriate documentation. Latest docs:
http://icecast.org/docs/icecast-latest/icecast2_stats.html
-->
</xsl:text>
<!--mount point stats--> <!--mount point stats-->
<h2>Status</h2> <h2>Status</h2>
<xsl:choose> <xsl:choose>