[Jboss-svn-commits] JBL Code SVN: r3267 - branches/forge/Labs-Portal-2.0-ComTheme/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins

[<jbo...@li...>]

Author: szimano
Date: 2006-03-27 12:30:50 -0500 (Mon, 27 Mar 2006)
New Revision: 3267

Modified:
   branches/forge/Labs-Portal-2.0-ComTheme/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java
   branches/forge/Labs-Portal-2.0-ComTheme/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
Log:
must login to make links between pages


Modified: branches/forge/Labs-Portal-2.0-ComTheme/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java
===================================================================
--- branches/forge/Labs-Portal-2.0-ComTheme/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java	2006-03-27 17:19:36 UTC (rev 3266)
+++ branches/forge/Labs-Portal-2.0-ComTheme/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java	2006-03-27 17:30:50 UTC (rev 3267)
@@ -37,8 +37,10 @@
 	public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
 
 		// you can link a page if it is editable for you
-		if (wikiPage.isEditable((Credentials) wikiSession
-				.getAttribute(WikiSession.CREDENTIALS))) {
+		if (((Credentials) wikiSession.getAttribute(WikiSession.CREDENTIALS))
+				.isLoggedIn()
+				&& wikiPage.isEditable((Credentials) wikiSession
+						.getAttribute(WikiSession.CREDENTIALS))) {
 
 			StringBuilder content = new StringBuilder(
 					HTMLTranslatorParts.pagePartRegexStart);
@@ -122,7 +124,11 @@
 
 			wikiPage.setContent(content.toString());
 
-		} else {
+		} else if (((Credentials) wikiSession.getAttribute(WikiSession.CREDENTIALS))
+				.isLoggedIn()) {
+			wikiPage.setContent("Please log in to make link to other language");
+		}
+		else {
 			wikiPage.setContent("This page is not editable for you");
 		}
 

Modified: branches/forge/Labs-Portal-2.0-ComTheme/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
===================================================================
--- branches/forge/Labs-Portal-2.0-ComTheme/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java	2006-03-27 17:19:36 UTC (rev 3266)
+++ branches/forge/Labs-Portal-2.0-ComTheme/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java	2006-03-27 17:30:50 UTC (rev 3267)
@@ -44,7 +44,7 @@
 
 			content.append("<h3>Other languages:");
 
-			if (wikiPage.isEditable(credentials)) {
+			if (credentials.isLoggedIn() && wikiPage.isEditable(credentials)) {
 				content.append(" <a href=\"").append(
 						wikiSession.getAttribute(WikiSession.ACTION_URL))
 						.append("&page=").append(wikiPage.getName()).append(