From 836ea14e473b327683524568009f389a139c29cc Mon Sep 17 00:00:00 2001
From: Luis Majano <lmajano@gmail.com>
Date: Tue, 24 Oct 2023 13:40:15 +0200
Subject: [PATCH] CONTENTBOX-1462 #resolve Generated Sitemap has broken links

---
 .../contentbox-sitemap/views/sitemap_html.cfm | 14 ++++++-------
 .../contentbox-sitemap/views/sitemap_json.cfm | 18 ++++++++---------
 .../contentbox-sitemap/views/sitemap_txt.cfm  |  8 ++++----
 .../contentbox-sitemap/views/sitemap_xml.cfm  | 20 +++++++++----------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_html.cfm b/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_html.cfm
index cbd46aa6cb..2bb050b5a6 100644
--- a/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_html.cfm
+++ b/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_html.cfm
@@ -6,25 +6,25 @@
 		<li>
 			<a href="#prc.linkHome#">Home</a>
 		</li>
-		
+
 		<cfloop array="#prc.aPages#" index="content">
 			<li>
-				<a href="#prc.siteBaseURL##content[ 'slug' ]#">#content[ 'title' ]#</a>
+				<a href="#prc.siteBaseURL#/#content[ 'slug' ]#">#content[ 'title' ]#</a>
 			</li>
 		</cfloop>
 
-		<cfif !prc.disableBlog>				
-		<li><a href="#prc.siteBaseURL##prc.blogEntryPoint#">#left( prc.blogEntryPoint, -1 )#</a>
+		<cfif !prc.disableBlog>
+		<li><a href="#prc.siteBaseURL#/#prc.blogEntryPoint#">#left( prc.blogEntryPoint, -1 )#</a>
 			<ul>
 				<cfloop array="#prc.aEntries#" index="content">
 					<li>
-						<a href="#prc.siteBaseURL##prc.blogEntryPoint##content[ 'slug' ]#">#content[ 'title' ]#</a>
+						<a href="#prc.siteBaseURL#/#prc.blogEntryPoint##content[ 'slug' ]#">#content[ 'title' ]#</a>
 					</li>
 				</cfloop>
 			</ul>
 		</li>
 	</cfif>
-	</ul> 	
+	</ul>
 </cfoutput>
 </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_json.cfm b/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_json.cfm
index 10f6bd0c46..1f4974eab3 100644
--- a/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_json.cfm
+++ b/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_json.cfm
@@ -1,29 +1,29 @@
 <cfoutput>[
 	{"loc": "#prc.linkHome#" }
 	<cfloop array="#prc.aPages#" index="content">
-	,{ 
-		"loc": "#prc.siteBaseURL##content[ 'slug' ]#",
+	,{
+		"loc": "#prc.siteBaseURL#/#content[ 'slug' ]#",
 		"lastmod": "#dateFormat( content[ 'modifiedDate' ], "yyyy-mm-dd" )#"
 		<cfif len( content.get( "featuredImageURL" ) )>
 		,"image": {
-			"loc": "#prc.siteBaseURL & reReplace( content.get( "featuredImageURL" ), "^/", "" )#"
+			"loc": "#prc.siteBaseURL & "/" & reReplace( content.get( "featuredImageURL" ), "^/", "" )#"
 		}
-		</cfif> 
+		</cfif>
 	}
 	</cfloop>
-	<cfif !prc.disableBlog>				
+	<cfif !prc.disableBlog>
 		,{ "loc": "#prc.siteBaseURL##prc.blogEntryPoint#" }
 		<cfloop array="#prc.aEntries#" index="content">
-	   		,{ 
-	   			"loc": "#prc.siteBaseURL##prc.blogEntryPoint##content[ 'slug' ]#",
+	   		,{
+	   			"loc": "#prc.siteBaseURL#/#prc.blogEntryPoint##content[ 'slug' ]#",
 	   			"lastmod": "#dateFormat( content[ 'modifiedDate' ], "yyyy-mm-dd" )#"
 		      	<cfif len( content.get( "featuredImageURL" ) )>
 		      		, "image": {
-		      			"loc": "#prc.siteBaseURL & reReplace( content.get( "featuredImageURL" ), "^/", "" )#"	
+		      			"loc": "#prc.siteBaseURL & "/" & reReplace( content.get( "featuredImageURL" ), "^/", "" )#"
 		      		}
 		      	</cfif>
 	   		}
 		</cfloop>
 	</cfif>
 ]
-</cfoutput>
\ No newline at end of file
+</cfoutput>
diff --git a/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_txt.cfm b/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_txt.cfm
index db5ae05b6f..e540d8a393 100644
--- a/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_txt.cfm
+++ b/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_txt.cfm
@@ -1,12 +1,12 @@
 <cfoutput><!---
 --->#prc.linkHome##chr( 10 )#<!---
 ---><cfloop array="#prc.aPages#" index="content"><!---
---->#prc.siteBaseURL##content[ 'slug' ]#
+--->#prc.siteBaseURL#/#content[ 'slug' ]#
 </cfloop><!---
 ---><cfif !prc.disableBlog><!---
---->#prc.siteBaseURL##prc.blogEntryPoint#
+--->#prc.siteBaseURL#/#prc.blogEntryPoint#
 <cfloop array="#prc.aEntries#" index="content"><!---
---->#prc.siteBaseURL##prc.blogEntryPoint##content[ 'slug' ]#
+--->#prc.siteBaseURL#/#prc.blogEntryPoint##content[ 'slug' ]#
 </cfloop><!---
 ---></cfif>
-</cfoutput>
\ No newline at end of file
+</cfoutput>
diff --git a/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_xml.cfm b/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_xml.cfm
index 6f9433436a..d188186897 100644
--- a/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_xml.cfm
+++ b/modules/contentbox/modules/contentbox-ui/modules/contentbox-sitemap/views/sitemap_xml.cfm
@@ -3,33 +3,33 @@
 		xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
 	<url>
 		<loc>#XMLFormat( prc.linkHome )#</loc>
-	</url>  
+	</url>
 	<cfloop array="#prc.aPages#" index="content">
 	<url>
-		<loc>#xmlFormat( prc.siteBaseURL & content[ 'slug' ] )#</loc>
+		<loc>#xmlFormat( prc.siteBaseURL & "/" & content[ 'slug' ] )#</loc>
 		<lastmod>#dateFormat( content[ 'modifiedDate' ], "yyyy-mm-dd" )#</lastmod>
 		<cfif len( content.get( "featuredImageURL" ) )>
       		<image:image>
-       			<image:loc>#xmlFormat( prc.siteBaseURL & reReplace( content.get( "featuredImageURL" ), "^/", "" ) )#</image:loc>
+       			<image:loc>#xmlFormat( prc.siteBaseURL & "/" & reReplace( content.get( "featuredImageURL" ), "^/", "" ) )#</image:loc>
     		</image:image>
       	</cfif>
 	</url>
 	</cfloop>
-	<cfif !prc.disableBlog>				
+	<cfif !prc.disableBlog>
 		<url>
-			<loc>#xmlFormat( prc.siteBaseURL & prc.blogEntryPoint )#</loc>
-		</url>	
+			<loc>#xmlFormat( prc.siteBaseURL & "/" & prc.blogEntryPoint )#</loc>
+		</url>
 		<cfloop array="#prc.aEntries#" index="content">
 	   		<url>
-	      		<loc>#xmlFormat(  prc.siteBaseURL & prc.blogEntryPoint & content[ 'slug' ] )#</loc>
+	      		<loc>#xmlFormat(  prc.siteBaseURL & "/" & prc.blogEntryPoint & content[ 'slug' ] )#</loc>
 	      		<lastmod>#dateFormat( content[ 'modifiedDate' ], "yyyy-mm-dd" )#</lastmod>
 		      	<cfif len( content.get( "featuredImageURL" ) )>
 		      		<image:image>
-		       			<image:loc>#xmlFormat( prc.siteBaseURL & reReplace( content.get( "featuredImageURL" ), "^/", "" ) )#</image:loc>
+		       			<image:loc>#xmlFormat( prc.siteBaseURL & "/" & reReplace( content.get( "featuredImageURL" ), "^/", "" ) )#</image:loc>
 		    		</image:image>
 		      	</cfif>
 	   		</url>
 		</cfloop>
 	</cfif>
-</urlset> 	
-</cfoutput>
\ No newline at end of file
+</urlset>
+</cfoutput>