From d96153387723f18eb0d13dfc9753b70e69802964 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 13 Aug 2014 13:29:55 +0000
Subject: [PATCH] Extend valid URL checking to all appropruate MDUI elements.

---
 mdx/_rules/check_mdui.xsl | 45 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/mdx/_rules/check_mdui.xsl b/mdx/_rules/check_mdui.xsl
index c24d01e3..5615990b 100644
--- a/mdx/_rules/check_mdui.xsl
+++ b/mdx/_rules/check_mdui.xsl
@@ -191,16 +191,57 @@
 		</xsl:if>
 	</xsl:template>
 	
+	<!--
+        Check for <mdui:Logo> elements that aren't valid URLs.
+        
+        Again, explicitly permit anything starting with 'data:'.
+    -->
+	<xsl:template match="mdui:Logo[mdxURL:invalidURL(.)]">
+		<xsl:if test="not(starts-with(., 'data:'))">
+			<xsl:call-template name="error">
+				<xsl:with-param name="m">
+					<xsl:text>mdui:</xsl:text>
+					<xsl:value-of select='local-name()'/>
+					<xsl:text> '</xsl:text>
+					<xsl:value-of select="."/>
+					<xsl:text>' is not a valid URL: </xsl:text>
+					<xsl:value-of select="mdxURL:whyInvalid(.)"/>
+				</xsl:with-param>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+	
 	<!--
 		Section 2.1.6 Element <mdui:InformationURL>
 		
 		Require that the URL is valid.
 	-->
-	<xsl:template match="md:InformationURL[mdxURL:invalidURL(.)]">
+	<xsl:template match="mdui:InformationURL[mdxURL:invalidURL(.)]">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">
+				<xsl:text>mdui:</xsl:text>
+				<xsl:value-of select='local-name()'/>
+				<xsl:text> '</xsl:text>
+				<xsl:value-of select="."/>
+				<xsl:text>' is not a valid URL: </xsl:text>
+				<xsl:value-of select="mdxURL:whyInvalid(.)"/>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<!--
+        Section 2.1.7 Element <mdui:PrivacyStatementURL>
+        
+        Require that the URL is valid.
+    -->
+	<xsl:template match="mdui:PrivacyStatementURL[mdxURL:invalidURL(.)]">
 		<xsl:call-template name="error">
 			<xsl:with-param name="m">
+				<xsl:text>mdui:</xsl:text>
 				<xsl:value-of select='local-name()'/>
-				<xsl:text> is not a valid URL: </xsl:text>
+				<xsl:text> '</xsl:text>
+				<xsl:value-of select="."/>
+				<xsl:text>' is not a valid URL: </xsl:text>
 				<xsl:value-of select="mdxURL:whyInvalid(.)"/>
 			</xsl:with-param>
 		</xsl:call-template>