From 41f9ed3c670caefea175d2ea07f1f9afc778e8e8 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Thu, 16 Sep 2010 18:00:16 +0000
Subject: [PATCH] Fixed rss links implemented

---
 Builder/IISMainHandler/build.txt | 2 +-
 templates/Full/AllPosts.xslt     | 1 +
 templates/Full/AllThreads.xslt   | 1 +
 templates/Full/Board.xslt        | 4 +++-
 templates/Full/UserPosts.xslt    | 6 ++++--
 templates/Full/UserReplies.xslt  | 6 ++++--
 templates/Full/UserThreads.xslt  | 4 +++-
 templates/Full/elems/Header.xslt | 8 ++++++--
 8 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index eb0b3e7..8acff5e 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1358
\ No newline at end of file
+1364
\ No newline at end of file
diff --git a/templates/Full/AllPosts.xslt b/templates/Full/AllPosts.xslt
index 689d6dc..92e2986 100644
--- a/templates/Full/AllPosts.xslt
+++ b/templates/Full/AllPosts.xslt
@@ -6,6 +6,7 @@
 		<xsl:text>Все сообщения</xsl:text>
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
+	<xsl:template name="rssRelativeLink">/AllPosts/</xsl:template>
 	<xsl:template name="specific">
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
diff --git a/templates/Full/AllThreads.xslt b/templates/Full/AllThreads.xslt
index 22a1315..f8c8916 100644
--- a/templates/Full/AllThreads.xslt
+++ b/templates/Full/AllThreads.xslt
@@ -6,6 +6,7 @@
 		<xsl:text>Все темы</xsl:text>
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
+	<xsl:template name="rssRelativeLink">/AllThreads/</xsl:template>
 	<xsl:template name="specific">
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
diff --git a/templates/Full/Board.xslt b/templates/Full/Board.xslt
index 7672ab5..68a8104 100644
--- a/templates/Full/Board.xslt
+++ b/templates/Full/Board.xslt
@@ -8,6 +8,8 @@
 	</xsl:template>
 	<xsl:template name="isLiteEnabled">true</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
+	<xsl:variable name="baseLink">/Board/<xsl:value-of select="/root/currentLocation/board/id"/>/</xsl:variable>
+	<xsl:template name="rssRelativeLink"><xsl:value-of select="$baseLink"/></xsl:template>
 	<xsl:template name="specific">
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
@@ -126,7 +128,7 @@
 								<font class="onbody">
 									<xsl:text>страницы:</xsl:text>
 									<xsl:apply-templates select="threads/pageOuter" mode="withCurrent">
-										<xsl:with-param name="baseLink">/Board/<xsl:value-of select="currentLocation/board/id"/>/</xsl:with-param>
+										<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
 									</xsl:apply-templates>
 								</font>
 							</td>
diff --git a/templates/Full/UserPosts.xslt b/templates/Full/UserPosts.xslt
index d6541a4..106b59b 100644
--- a/templates/Full/UserPosts.xslt
+++ b/templates/Full/UserPosts.xslt
@@ -7,6 +7,8 @@
 		<xsl:value-of select="user/name"/>
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
+	<xsl:variable name="baseLink">/Users/User/<xsl:value-of select="/root/user/id"/>/Posts/</xsl:variable>
+	<xsl:template name="rssRelativeLink"><xsl:value-of select="$baseLink"/></xsl:template>
 	<xsl:template name="specific">
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
@@ -19,7 +21,7 @@
 										<td>
 											<xsl:text>страницы:</xsl:text>
 											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent">
-												<xsl:with-param name="baseLink">/Users/User/<xsl:value-of select="user/id"/>/Posts/</xsl:with-param>
+												<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
 											</xsl:apply-templates>
 										</td>
 									</tr>
@@ -34,7 +36,7 @@
 										<td>
 											<xsl:text>страницы:</xsl:text>
 											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent">
-												<xsl:with-param name="baseLink">/Users/User/<xsl:value-of select="user/id"/>/Posts/</xsl:with-param>
+												<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
 											</xsl:apply-templates>
 										</td>
 									</tr>
diff --git a/templates/Full/UserReplies.xslt b/templates/Full/UserReplies.xslt
index 9172e73..aa4d96c 100644
--- a/templates/Full/UserReplies.xslt
+++ b/templates/Full/UserReplies.xslt
@@ -7,6 +7,8 @@
 		<xsl:value-of select="user/name"/>
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
+	<xsl:variable name="baseLink">/Users/User/<xsl:value-of select="/root/user/id"/>/Replies/</xsl:variable>
+	<xsl:template name="rssRelativeLink"><xsl:value-of select="$baseLink"/></xsl:template>
 	<xsl:template name="specific">
 		<table width="95%" align="center" cellpadding="1" cellspacing="1" class="tablesurround">
 			<tr>
@@ -19,7 +21,7 @@
 										<td>
 											<xsl:text>страницы:</xsl:text>
 											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent">
-												<xsl:with-param name="baseLink">/Users/User/<xsl:value-of select="user/id"/>/Replies/</xsl:with-param>
+												<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
 											</xsl:apply-templates>
 										</td>
 									</tr>
@@ -34,7 +36,7 @@
 										<td>
 											<xsl:text>страницы:</xsl:text>
 											<xsl:apply-templates select="posts/pageOuter" mode="withCurrent">
-												<xsl:with-param name="baseLink">/Users/User/<xsl:value-of select="user/id"/>/Replies/</xsl:with-param>
+												<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
 											</xsl:apply-templates>
 										</td>
 									</tr>
diff --git a/templates/Full/UserThreads.xslt b/templates/Full/UserThreads.xslt
index 5b026f6..6484a31 100644
--- a/templates/Full/UserThreads.xslt
+++ b/templates/Full/UserThreads.xslt
@@ -7,6 +7,8 @@
 		<xsl:value-of select="user/name"/>
 	</xsl:template>
 	<xsl:template name="isRssEnabled">true</xsl:template>
+	<xsl:variable name="baseLink">/Users/User/<xsl:value-of select="/root/user/id"/>/Threads/</xsl:variable>
+	<xsl:template name="rssRelativeLink"><xsl:value-of select="$baseLink"/></xsl:template>
 	<xsl:template name="specific">
 		<table width="95%" align="center" class="tablesurround">
 			<tr>
@@ -25,7 +27,7 @@
 								<font class="onbody">
 									<xsl:text>страницы:</xsl:text>
 									<xsl:apply-templates select="threads/pageOuter" mode="withCurrent">
-										<xsl:with-param name="baseLink">/Users/User/<xsl:value-of select="user/id"/>/Threads/</xsl:with-param>
+										<xsl:with-param name="baseLink"><xsl:value-of select="$baseLink"/></xsl:with-param>
 									</xsl:apply-templates>
 								</font>
 							</td>
diff --git a/templates/Full/elems/Header.xslt b/templates/Full/elems/Header.xslt
index 4f21718..6a5658d 100644
--- a/templates/Full/elems/Header.xslt
+++ b/templates/Full/elems/Header.xslt
@@ -6,6 +6,7 @@
 
 	<xsl:template name="isLiteEnabled">false</xsl:template>
 	<xsl:template name="isRssEnabled">false</xsl:template>
+	<xsl:template name="rssRelativeLink"><xsl:value-of select="currentUrl"/></xsl:template>
 
 	<xsl:template name="headerLink">
 		<xsl:param name="url"/>
@@ -80,6 +81,9 @@
 											<xsl:variable name="isRssEnabled">
 												<xsl:call-template name="isRssEnabled"/>
 											</xsl:variable>
+											<xsl:variable name="rssRelativeLink">
+												<xsl:call-template name="rssRelativeLink"/>
+											</xsl:variable>
 											<xsl:variable name="prefix">
 												<xsl:text>https://</xsl:text>
 												<xsl:value-of select="url/host"/>
@@ -112,7 +116,7 @@
 													<xsl:attribute name="href">
 														<xsl:value-of select="$prefix"/>
 														<xsl:text>449</xsl:text>
-														<xsl:value-of select="currentUrl"/>
+														<xsl:value-of select="$rssRelativeLink"/>
 													</xsl:attribute>
 												</xsl:if>
 												<img border="0">
@@ -130,7 +134,7 @@
 													<xsl:attribute name="href">
 														<xsl:value-of select="$prefix"/>
 														<xsl:text>449</xsl:text>
-														<xsl:value-of select="currentUrl"/>
+														<xsl:value-of select="$rssRelativeLink"/>
 													</xsl:attribute>
 												</link>
 											</xsl:if>