Correcting minor differences with v4's exit script fix

plup2 · plup2 · commit 76bcba2e9d81 · 2023-11-09T09:56:39.000-05:00
diff --git a/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/BaseUtil.java b/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/BaseUtil.java
@@ -20,8 +20,8 @@ public static void doLocaleSwitch(HttpServletRequest req, HttpServletResponse re
 		
 		String prevUrl = URLDecoder.decode(req.getParameter(Constants.QUERYSTRING_KEY), "UTF-8");
 
-		// Validate that the redirect link is relative to the host and NOT absolute or relative to scheme                                                
-		if ((!prevUrl.startsWith("/")) || prevUrl.startsWith("//")) throw new Exception("Unauthorized return URL specified for language switching.");    
+		// Validate that the redirect link is relative to the host and NOT absolute or relative to scheme
+		if ((!prevUrl.startsWith("/")) || prevUrl.startsWith("//")) throw new Exception("Unauthorized return URL specified for language switching.");
 
 		res.sendRedirect(prevUrl);
 	}
diff --git a/gocwebtemplate-sample-jsp/src/main/webapp/samplecontents/leavesecuresitesamplecontent.jsp b/gocwebtemplate-sample-jsp/src/main/webapp/samplecontents/leavesecuresitesamplecontent.jsp
@@ -1,4 +1,4 @@
-<h1>GoC Web Template Samples - Leaving Secure Site</h1>
+<h1 id="wb-cont">GoC Web Template Samples - Leaving Secure Site</h1>
 <p>In certain scenarios (ex: secure sites) we want to notify the user that the link or action they have just performed will exit the current secured site/session and it is possible that data could be lost. The message allows the user to cancel the redirect or continue with the redirect.</p>
 <h2>Pre-requisite</h2>
 <p>To override the Default GoC Web Template look &amp; feel, you will have to create a custom bean class that extends the <code class="wb-prettify">goc.webtemplate.component.jsp.BaseCoreBean</code> class, and then override the various methods made available to alter the look &amp; feel of the web page.</p>
diff --git a/gocwebtemplate-sample-spring/src/main/resources/samples/LeavingSecureSiteSample.html b/gocwebtemplate-sample-spring/src/main/resources/samples/LeavingSecureSiteSample.html
@@ -4,7 +4,7 @@
 </head>
 <body>
 	<section layout:fragment="content"> 
-		<h1>GoC Web Template Samples - Leaving Secure Site</h1>
+		<h1 id="wb-cont">GoC Web Template Samples - Leaving Secure Site</h1>
 	    <p>In certain scenarios (ex: secure sites) we want to notify the user that the link or action they have just performed will exit the current secured site/session and it is possible that data could be lost. The message allows the user to cancel the redirect or continue with the redirect.</p>
 	    <h2>Pre-requisite</h2>
     	<p>To override the Default GoC Web Template look &amp; feel, you will have to create a custom bean class that extends the <code class="wb-prettify">goc.webtemplate.component.spring.BaseCoreBean</code> class, and then override the various methods made available to alter the look &amp; feel of the web page.</p>

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public static void doLocaleSwitch(HttpServletRequest req, HttpServletResponse re`
`20`	`20`
`21`	`21`	`String prevUrl = URLDecoder.decode(req.getParameter(Constants.QUERYSTRING_KEY), "UTF-8");`
`22`	`22`
`23`		`- // Validate that the redirect link is relative to the host and NOT absolute or relative to scheme`
`24`		`- if ((!prevUrl.startsWith("/")) \|\| prevUrl.startsWith("//")) throw new Exception("Unauthorized return URL specified for language switching.");`
	`23`	`+ // Validate that the redirect link is relative to the host and NOT absolute or relative to scheme`
	`24`	`+ if ((!prevUrl.startsWith("/")) \|\| prevUrl.startsWith("//")) throw new Exception("Unauthorized return URL specified for language switching.");`
`25`	`25`
`26`	`26`	`res.sendRedirect(prevUrl);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<h1>GoC Web Template Samples - Leaving Secure Site</h1>`
	`1`	`+<h1 id="wb-cont">GoC Web Template Samples - Leaving Secure Site</h1>`
`2`	`2`	`<p>In certain scenarios (ex: secure sites) we want to notify the user that the link or action they have just performed will exit the current secured site/session and it is possible that data could be lost. The message allows the user to cancel the redirect or continue with the redirect.</p>`
`3`	`3`	`<h2>Pre-requisite</h2>`
`4`	`4`	`<p>To override the Default GoC Web Template look & feel, you will have to create a custom bean class that extends the <code class="wb-prettify">goc.webtemplate.component.jsp.BaseCoreBean</code> class, and then override the various methods made available to alter the look & feel of the web page.</p>`