[jboss-svn-commits] JBL Code SVN: r9555 - labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2007-02-16 10:11:48 -0500 (Fri, 16 Feb 2007)
New Revision: 9555

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/InjectLoginLinks.java
Log:
login injection fixed

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/InjectLoginLinks.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/InjectLoginLinks.java	2007-02-16 11:11:33 UTC (rev 9554)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/InjectLoginLinks.java	2007-02-16 15:11:48 UTC (rev 9555)
@@ -97,20 +97,24 @@
 		if (loginIndx != -1) {
 
 			StringBuffer newUri = new StringBuffer();
-			newUri.append("<a href='").append(uri).append("'>Login</a>");
-			
+			newUri.append("<a href='").append(uri);
+
 			if (uri.equals("/")) {
-				newUri.append(AUTH_LINK);
+				newUri.append(AUTH_LINK).append("'>Login</a>");
 			} else if (newUri.indexOf(AUTH_LINK) == -1
-					&& newUri.indexOf(AUTH_LINK2) == -1) {
+					&& newUri.indexOf(AUTH_LINK2) == -1 && principal == null) {
 				// add AUTH_LINK
 				int p = newUri.indexOf(PORTAL);
-				newUri.insert(p, "/").insert(p, AUTH_LINK);
+				newUri.insert(p, "/").insert(p + 1, AUTH_LINK).append(
+						"'>Login</a>");
 			} else if (principal != null) {
 				// user is logged in
 				newUri = new StringBuffer("<span class='wlcmBox'><b>").append(
 						principal.getName()).append(
-						"</b> | <a href='/portal/logout'>Logout</a> </span>");
+						"</b> | <a href='/logout'>Logout</a> </span>");
+			} else {
+				// this is login page. just show login link
+				newUri.append("'>Login</a>");
 			}
 
 			StringBuffer newContent = new StringBuffer();