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

Closes: #2396
2024-12-04 14:46:30 -05:00 · 2020-10-09 09:36:03 +00:00 · 2020-10-09 09:36:03 +00:00 · fde951551f
commit fde951551f
parent f9217eae35
22 changed files with 34 additions and 54 deletions
--- a/admin/dashboard.xsl
+++ b/admin/dashboard.xsl
@ -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: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:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 	<xsl:include href="includes/page.xsl"/>
 	<xsl:variable name="title">Dashboard</xsl:variable>

--- a/admin/error-html.xsl
+++ b/admin/error-html.xsl
@ -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: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:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 	<xsl:include href="includes/web-page.xsl"/>
 	<xsl:variable name="title">Error</xsl:variable>

--- a/admin/fallbacks.xsl
+++ b/admin/fallbacks.xsl
@ -1,5 +1,4 @@
 <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 -->
 	<xsl:include href="includes/page.xsl"/>
 	<xsl:include href="includes/mountnav.xsl"/>
--- a/admin/includes/footer.xsl
+++ b/admin/includes/footer.xsl
@ -1,5 +1,4 @@
 <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">

 		<div class="footer">
--- a/admin/includes/head.xsl
+++ b/admin/includes/head.xsl
@ -1,5 +1,4 @@
 <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:param name="title"/>
 		<head>
--- a/admin/includes/header.xsl
+++ b/admin/includes/header.xsl
@ -1,5 +1,4 @@
 <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">

 		<header>
--- a/admin/includes/mountnav.xsl
+++ b/admin/includes/mountnav.xsl
@ -1,5 +1,4 @@
 <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:param name="mount" select="@mount"/>
 		<div class="mountnav">
--- a/admin/includes/page.xsl
+++ b/admin/includes/page.xsl
@ -1,5 +1,5 @@
 <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 -->
 	<xsl:include href="includes/head.xsl"/>
 	<xsl:include href="includes/header.xsl"/>
--- a/admin/includes/player.xsl
+++ b/admin/includes/player.xsl
@ -1,5 +1,4 @@
 <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">
 		<div>
 			<ul class="playlists">
--- a/admin/includes/playlist.xsl
+++ b/admin/includes/playlist.xsl
@ -1,5 +1,4 @@
 <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:if test="playlist/*">
 			<h4>Playlist</h4>
--- a/admin/includes/web-page.xsl
+++ b/admin/includes/web-page.xsl
@ -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: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: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 -->

    <xsl:template match="/node()">
@ -15,6 +15,15 @@
                <meta name="description" content="Icecast is free server software for streaming multimedia." />
            </head>
            <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>
                    <nav id="main-nav" role="primary">
--- a/admin/listclients.xsl
+++ b/admin/listclients.xsl
@ -1,5 +1,4 @@
 <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 -->
 	<xsl:include href="includes/page.xsl"/>
 	<xsl:include href="includes/mountnav.xsl"/>
--- a/admin/listmounts.xsl
+++ b/admin/listmounts.xsl
@ -1,5 +1,4 @@
 <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 -->
 	<xsl:include href="includes/page.xsl"/>
 	<xsl:include href="includes/mountnav.xsl"/>
--- a/admin/manageauth.xsl
+++ b/admin/manageauth.xsl
@ -1,5 +1,4 @@
 <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 -->
 	<xsl:include href="includes/page.xsl"/>
 	<xsl:include href="includes/mountnav.xsl"/>
--- a/admin/moveclients.xsl
+++ b/admin/moveclients.xsl
@ -1,5 +1,4 @@
 <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 -->
 	<xsl:include href="includes/page.xsl"/>
 	<xsl:include href="includes/mountnav.xsl"/>
--- a/admin/response.xsl
+++ b/admin/response.xsl
@ -1,5 +1,4 @@
 <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 -->
 	<xsl:include href="includes/page.xsl"/>

--- a/admin/showlog.xsl
+++ b/admin/showlog.xsl
@ -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: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:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 	<xsl:include href="includes/page.xsl"/>
 	<xsl:variable name="title">Logfiles</xsl:variable>

--- a/admin/stats.xsl
+++ b/admin/stats.xsl
@ -1,5 +1,4 @@
 <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 -->
 	<xsl:include href="includes/page.xsl"/>
 	<xsl:include href="includes/mountnav.xsl"/>
--- a/admin/updatemetadata.xsl
+++ b/admin/updatemetadata.xsl
@ -1,5 +1,4 @@
 <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 -->
 	<xsl:include href="includes/page.xsl"/>
 	<xsl:include href="includes/mountnav.xsl"/>
--- a/web/auth.xsl
+++ b/web/auth.xsl
@ -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: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:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:include href="includes/web-page.xsl"/>
 <xsl:variable name="title">Authorization Page</xsl:variable>
 <xsl:template name="content">
--- a/web/server_version.xsl
+++ b/web/server_version.xsl
@ -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: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:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:include href="includes/web-page.xsl"/>
 <xsl:variable name="title">Server Information</xsl:variable>
 <xsl:template name="content">
--- a/web/status.xsl
+++ b/web/status.xsl
@ -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: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:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:include href="includes/web-page.xsl"/>
 <xsl:include href="includes/player.xsl"/>
 <xsl:include href="includes/playlist.xsl"/>
 <xsl:variable name="title">Status</xsl:variable>
 <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-->
 	<h2>Status</h2>
 	<xsl:choose>