From 7c2c8c51d434211449862fa1b2f375710ccb4c38 Mon Sep 17 00:00:00 2001
From: Jan Girlich <vollkorn@cryptobitch.de>
Date: Tue, 17 Sep 2019 08:15:31 +0200
Subject: [PATCH 1/2] Add missing / to download paths

---
 data.xml | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/data.xml b/data.xml
index 4041a33..02c4a4b 100644
--- a/data.xml
+++ b/data.xml
@@ -255,12 +255,12 @@ Zudem gibt es einen neuen Redaktions-PGP-Key, erhältlich auf allen Keyservern o
 </schleuder>
 <schleuder id="57">
 	<image>covers/ds57.jpg</image>
-	<link>pdfs/ds057.pdf</link>
+	<link>/pdfs/ds057.pdf</link>
 	<filesize>761897</filesize>
 </schleuder>
 <schleuder id="56">
 	<image>covers/ds56.jpg</image>
-	<link>pdfs/ds056.pdf</link>
+	<link>/pdfs/ds056.pdf</link>
 	<filesize>467698</filesize>
 </schleuder>
 <schleuder id="55">
@@ -275,7 +275,7 @@ Zudem gibt es einen neuen Redaktions-PGP-Key, erhältlich auf allen Keyservern o
 </schleuder>
 <schleuder id="53">
 	<image>covers/ds53.jpg</image>
-	<link>pdfs/ds053.pdf</link>
+	<link>/pdfs/ds053.pdf</link>
 	<filesize>817544</filesize>
 </schleuder>
 <schleuder id="52">
@@ -300,22 +300,22 @@ Zudem gibt es einen neuen Redaktions-PGP-Key, erhältlich auf allen Keyservern o
 </schleuder>
 <schleuder id="48">
 	<image>covers/ds48.jpg</image>
-	<link>pdfs/ds048.pdf</link>
+	<link>/pdfs/ds048.pdf</link>
 	<filesize>841492</filesize>
 </schleuder>
 <schleuder id="47">
 	<image>covers/ds47.jpg</image>
-	<link>pdfs/ds047.pdf</link>
+	<link>/pdfs/ds047.pdf</link>
 	<filesize>1369065</filesize>
 </schleuder>
 <schleuder id="46">
 	<image>covers/ds46.jpg</image>
-	<link>pdfs/ds046.pdf</link>
+	<link>/pdfs/ds046.pdf</link>
 	<filesize>1432054</filesize>
 </schleuder>
 <schleuder id="45">
 	<image>covers/ds45.jpg</image>
-	<link>pdfs/ds045.pdf</link>
+	<link>/pdfs/ds045.pdf</link>
 	<filesize>959569</filesize>
 </schleuder>
 <schleuder id="44,5">
@@ -325,77 +325,77 @@ Zudem gibt es einen neuen Redaktions-PGP-Key, erhältlich auf allen Keyservern o
 </schleuder>
 <schleuder id="44">
 	<image>covers/ds44.jpg</image>
-	<link>pdfs/ds044.pdf</link>
+	<link>/pdfs/ds044.pdf</link>
 	<filesize>934477</filesize>
 </schleuder>
 <schleuder id="43">
 	<image>covers/ds43.jpg</image>
-	<link>pdfs/ds043.pdf</link>
+	<link>/pdfs/ds043.pdf</link>
 	<filesize>1511021</filesize>
 </schleuder>
 <schleuder id="42">
 	<image>covers/ds42.jpg</image>
-	<link>pdfs/ds042.pdf</link>
+	<link>/pdfs/ds042.pdf</link>
 	<filesize>1008532</filesize>
 </schleuder>
 <schleuder id="41">
 	<image>covers/ds41.jpg</image>
-	<link>pdfs/ds041.pdf</link>
+	<link>/pdfs/ds041.pdf</link>
 	<filesize>1772903</filesize>
 </schleuder>
 <schleuder id="40">
 	<image>covers/ds40.jpg</image>
-	<link>pdfs/ds040.pdf</link>
+	<link>/pdfs/ds040.pdf</link>
 	<filesize>724630</filesize>
 </schleuder>
 <schleuder id="39">
 	<image>covers/ds39.jpg</image>
-	<link>pdfs/ds039.pdf</link>
+	<link>/pdfs/ds039.pdf</link>
 	<filesize>5660515</filesize>
 </schleuder>
 <schleuder id="38">
 	<image>covers/ds38.jpg</image>
-	<link>pdfs/ds038.pdf</link>
+	<link>/pdfs/ds038.pdf</link>
 	<filesize>9309080</filesize>
 </schleuder>
 <schleuder id="37">
 	<image>covers/ds37.jpg</image>
-	<link>pdfs/ds037.pdf</link>
+	<link>/pdfs/ds037.pdf</link>
 	<filesize>5955897</filesize>
 </schleuder>
 <schleuder id="36">
 	<image>covers/ds36.jpg</image>
-	<link>pdfs/ds036.pdf</link>
+	<link>/pdfs/ds036.pdf</link>
 	<filesize>3988877</filesize>
 </schleuder>
 <schleuder id="35">
 	<image>covers/ds35.jpg</image>
-	<link>pdfs/ds035.pdf</link>
+	<link>/pdfs/ds035.pdf</link>
 	<filesize>1132711</filesize>
 </schleuder>
 <schleuder id="34">
 	<image>covers/ds34.jpg</image>
-	<link>pdfs/ds034.pdf</link>
+	<link>/pdfs/ds034.pdf</link>
 	<filesize>2377237</filesize>
 </schleuder>
 <schleuder id="33">
 	<image>covers/ds33.jpg</image>
-	<link>pdfs/ds033.pdf</link>
+	<link>/pdfs/ds033.pdf</link>
 	<filesize>3594296</filesize>
 </schleuder>
 <schleuder id="32">
 	<image>covers/ds32.jpg</image>
-	<link>pdfs/ds032.pdf</link>
+	<link>/pdfs/ds032.pdf</link>
 	<filesize>1007002</filesize>
 </schleuder>
 <schleuder id="31">
 	<image>covers/ds31.jpg</image>
-	<link>pdfs/ds031.pdf</link>
+	<link>/pdfs/ds031.pdf</link>
 	<filesize>1686370</filesize>
 </schleuder>
 <schleuder id="30">
 	<image>covers/ds30.jpg</image>
-	<link>pdfs/ds030.pdf</link>
+	<link>/pdfs/ds030.pdf</link>
 	<filesize>793690</filesize>
 </schleuder>
 <schleuder id="28/29">

From 8f8b198c8464326464a0a5ad9063cddecd5e0d64 Mon Sep 17 00:00:00 2001
From: vv01f <vv01f@users.noreply.github.com>
Date: Tue, 17 Sep 2019 09:25:32 +0200
Subject: [PATCH 2/2] * fix baseurl before links with ://

---
 download.xsl | 70 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 58 insertions(+), 12 deletions(-)

diff --git a/download.xsl b/download.xsl
index 8182e79..ce50916 100644
--- a/download.xsl
+++ b/download.xsl
@@ -47,18 +47,55 @@
 				<xsl:attribute name="id">ds<xsl:value-of select="$id"/></xsl:attribute>
 				<xsl:element name="div">
 					<xsl:attribute name="class">schleudercover</xsl:attribute>
-					<xsl:element name="a">
-						<xsl:attribute name="href"><xsl:value-of select="concat($protocol,$baseurl,link)"/></xsl:attribute>
-						<xsl:element name="img">
-							<xsl:attribute name="src"><xsl:value-of select="image"/></xsl:attribute>
-							<xsl:attribute name="alt"><xsl:value-of select="$alt"/></xsl:attribute>
-							<xsl:attribute name="height">93</xsl:attribute>
-						</xsl:element>
-					</xsl:element>
+					<xsl:choose>
+						<xsl:when test="link != ''">
+							<xsl:element name="a">
+								<xsl:attribute name="href">
+									<xsl:choose>
+										<xsl:when test="contains(link,'://')">
+											<xsl:value-of select="link"/>
+										</xsl:when>
+										<!--xsl:when test="contains(link,'mailto:')">
+											<xsl:value-of select="link"/>
+										</xsl:when-->
+										<xsl:otherwise>
+											<xsl:value-of select="concat($protocol,$baseurl,link)"/>
+										</xsl:otherwise>
+									</xsl:choose>
+								</xsl:attribute>
+								<xsl:element name="img">
+									<xsl:attribute name="src"><xsl:value-of select="image"/></xsl:attribute>
+									<xsl:attribute name="alt"><xsl:value-of select="$alt"/></xsl:attribute>
+									<xsl:attribute name="height">93</xsl:attribute>
+								</xsl:element>
+							</xsl:element>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:element name="img">
+								<xsl:attribute name="src"><xsl:value-of select="image"/></xsl:attribute>
+								<xsl:attribute name="alt"><xsl:value-of select="$alt"/></xsl:attribute>
+								<xsl:attribute name="height">93</xsl:attribute>
+							</xsl:element>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:element><xsl:value-of select="concat(@id,' ')"/>
 				<xsl:for-each select="link">
 					<xsl:call-template name="anchorlink">
-						<xsl:with-param name="linkdata" select="concat($protocol,$baseurl,.)" />
+						<xsl:with-param name="linkdata">
+							<xsl:value-of select="." />
+						</xsl:with-param>
+						<xsl:with-param name="baseuri">
+							<xsl:choose>
+								<xsl:when test="contains(., '://')"></xsl:when>
+								<!--xsl:when test="contains(., '')"></xsl:when--><!-- other conditions could be applicable without the "//" in uri, e.g. "mailto:john@doe.com" -->
+								<!--xsl:when test="contains(., 'mailto:')">
+									<xsl:value-of select=""/>
+								</xsl:when-->
+								<xsl:otherwise>
+									<xsl:value-of select="concat($protocol,$baseurl)" />
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:with-param>
 					</xsl:call-template>
 				</xsl:for-each>
 				<xsl:if test="not(link)"><!-- fix for no icon glitch -->
@@ -79,6 +116,7 @@
 	<xsl:template name="anchorlink">
 		<xsl:param name="linkdata" />
 		<xsl:param name="typedata" />
+		<xsl:param name="baseuri" /><!-- todo: replace baseuri with "./" if it is $baseurl, take care of linkdata starting with "/" or "." -->
 		<xsl:choose>
 			<xsl:when test="not($typedata)">
 				<xsl:variable name="t">
@@ -90,10 +128,18 @@
 					</xsl:choose>
 				</xsl:variable>
 				<xsl:call-template name="anchorlink">
-				  <xsl:with-param name="linkdata" select="$linkdata" />
-				  <xsl:with-param name="typedata" select="$t" />
+					<xsl:with-param name="linkdata">
+						<xsl:choose>
+							<xsl:when test="not($baseuri)">
+								<xsl:value-of select="$linkdata"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:value-of select="concat($baseuri,$linkdata)"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:with-param>
+					<xsl:with-param name="typedata" select="$t" />
 				</xsl:call-template>
-				
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:element name="a">