Author: tyrell
Date: Mon Jan 28 01:24:43 2008
New Revision: 13041
Log:
Fixing a redirection issue from http to https when a user is logged in.
Modified:
trunk/mashup/java/modules/www/header.jsp
trunk/mashup/java/modules/www/js/utils.js
trunk/mashup/java/modules/www/register_self.jsp
Modified: trunk/mashup/java/modules/www/header.jsp
==============================================================================
--- trunk/mashup/java/modules/www/header.jsp (original)
+++ trunk/mashup/java/modules/www/header.jsp Mon Jan 28 01:24:43 2008
@@ -19,6 +19,12 @@
<script type="text/javascript" src="js/utils.js"></script>
<script type="text/javascript" language="JavaScript">
var isUserLoggedIn = <%=RegistryUtils.isLoggedIn(registry)%>;
+ var thisPage = '<%=thisPage%>';
+
+ if((thisPage=='signin.jsp') || (thisPage=='register_self.jsp')){
+ redirectToHttps("<%=thisPage%>");
+ }
+
if(isUserLoggedIn){
redirectToHttps("<%=thisPage%>");
}else{
Modified: trunk/mashup/java/modules/www/js/utils.js
==============================================================================
--- trunk/mashup/java/modules/www/js/utils.js (original)
+++ trunk/mashup/java/modules/www/js/utils.js Mon Jan 28 01:24:43 2008
@@ -96,10 +96,10 @@
var redirectUrl = "https://"; + self.location.hostname;
if(!(URL.indexOf('://') == URL.lastIndexOf(':'))){
- redirectUrl += ":" + HTTPS_PORT + "/";
+ redirectUrl += ":" + HTTP_PORT;
}
- redirectUrl += bounceback;
+ redirectUrl += "/" + decodeURI(bounceback);
window.location = redirectUrl;
}
@@ -116,10 +116,10 @@
var redirectUrlHttp = "http://"; + self.location.hostname;
if(!(URL.indexOf('://') == URL.lastIndexOf(':'))){
- redirectUrlHttp += ":" + HTTP_PORT + "/";
+ redirectUrlHttp += ":" + HTTP_PORT;
}
- redirectUrlHttp += bounceback;
+ redirectUrlHttp += "/" + decodeURI(bounceback);
window.location = redirectUrlHttp;
}
Modified: trunk/mashup/java/modules/www/register_self.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_self.jsp (original)
+++ trunk/mashup/java/modules/www/register_self.jsp Mon Jan 28 01:24:43 2008
@@ -82,7 +82,7 @@
</head>
<body>
<div id="page">
- <% String thisPage = bounceback; %>
+ <% String thisPage = "register_self.jsp"; %>
<%@ include file="header.jsp" %>
<div id="search"></div>
<div id="content" style="height:400px; ">
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
