You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/07/02 18:40:05 UTC
svn commit: r552536 - in
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui: core/
rendering/model/ rendering/velocity/deprecated/
Author: snoopdave
Date: Mon Jul 2 09:39:53 2007
New Revision: 552536
URL: http://svn.apache.org/viewvc?view=rev&rev=552536
Log:
Removing redundant and rarely used authorization methods from RollerSession
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java?view=diff&rev=552536&r1=552535&r2=552536
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java Mon Jul 2 09:39:53 2007
@@ -172,54 +172,6 @@
}
- /**
- * Is session's authenticated user authorized to work in current website?
- */
- public boolean isUserAuthorized(Weblog website)
- throws WebloggerException {
-
- User user = getAuthenticatedUser();
- if (user != null && user.getEnabled().booleanValue())
- return hasPermissions(website,WeblogPermission.LIMITED);
- return false;
- }
-
-
- /**
- * Is session's authenticated user authorized to post in current weblog?
- */
- public boolean isUserAuthorizedToAuthor(Weblog website)
- throws WebloggerException {
-
- User user = getAuthenticatedUser();
- if (user != null && user.getEnabled().booleanValue())
- return hasPermissions(website,WeblogPermission.AUTHOR);
- return false;
- }
-
-
- /**
- * Is session's authenticated user authorized to admin current weblog?
- */
- public boolean isUserAuthorizedToAdmin(Weblog website)
- throws WebloggerException {
-
- User user = getAuthenticatedUser();
- if (user != null && user.getEnabled().booleanValue())
- return hasPermissions(website,WeblogPermission.ADMIN);
- return false;
- }
-
-
- private boolean hasPermissions(Weblog website, short mask) {
-
- User user = getAuthenticatedUser();
- if (website != null && user != null) {
- return website.hasUserPermissions(user, mask);
- }
- return false;
- }
-
private void clearSession(HttpSessionEvent se) {
HttpSession session = se.getSession();
try {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java?view=diff&rev=552536&r1=552535&r2=552536
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java Mon Jul 2 09:39:53 2007
@@ -33,6 +33,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
@@ -120,7 +121,8 @@
try {
RollerSession rses = RollerSession.getRollerSession(request);
if (rses != null && rses.getAuthenticatedUser() != null) {
- return rses.isUserAuthorizedToAuthor(weblog.getPojo());
+ return weblog.getPojo().hasUserPermissions(
+ rses.getAuthenticatedUser(), WeblogPermission.AUTHOR);
}
} catch (Exception e) {
log.warn("ERROR: checking user authorization", e);
@@ -132,7 +134,8 @@
try {
RollerSession rses = RollerSession.getRollerSession(request);
if (rses != null && rses.getAuthenticatedUser() != null) {
- return rses.isUserAuthorizedToAdmin(weblog.getPojo());
+ return weblog.getPojo().hasUserPermissions(
+ rses.getAuthenticatedUser(), WeblogPermission.ADMIN);
}
} catch (Exception e) {
log.warn("ERROR: checking user authorization", e);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=552536&r1=552535&r2=552536
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Mon Jul 2 09:39:53 2007
@@ -37,6 +37,7 @@
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.wrapper.WeblogReferrerWrapper;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
@@ -141,7 +142,8 @@
RollerSession.getRollerSession(mRequest);
if ( rses != null && rses.getAuthenticatedUser() != null
&& mWebsite != null) {
- return rses.isUserAuthorizedToAdmin(mWebsite);
+ return mWebsite.hasUserPermissions(
+ rses.getAuthenticatedUser(), WeblogPermission.ADMIN);
}
} catch (Exception e) {
mLogger.warn("PageHelper.isUserAuthorizedToEdit)", e);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=552536&r1=552535&r2=552536
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Mon Jul 2 09:39:53 2007
@@ -58,6 +58,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.roller.weblogger.pojos.WeblogHitCount;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
/**
@@ -525,8 +526,8 @@
String excerpt = referer.getExcerpt();
if ( StringUtils.isNotEmpty(title)
&& StringUtils.isNotEmpty(excerpt) ) {
- if ( referer.getVisible().booleanValue()
- || rses.isUserAuthorizedToAdmin(referer.getWebsite()) ) {
+ if (referer.getVisible().booleanValue()
+ || referer.getWebsite().hasUserPermissions(rses.getAuthenticatedUser(), WeblogPermission.ADMIN) ) {
referers.add(WeblogReferrerWrapper.wrap(referer));
}
}
@@ -554,7 +555,7 @@
if ( StringUtils.isNotEmpty(title)
&& StringUtils.isNotEmpty(excerpt) ) {
if (referer.getVisible().booleanValue()
- || rses.isUserAuthorizedToAdmin(referer.getWebsite()) ) {
+ || referer.getWebsite().hasUserPermissions(rses.getAuthenticatedUser(), WeblogPermission.ADMIN) ) {
referers.add(WeblogReferrerWrapper.wrap(referer));
}
}
@@ -726,7 +727,7 @@
RollerSession rses =
RollerSession.getRollerSession(mRequest);
if (rses != null && rses.getAuthenticatedUser() != null && mWebsite != null) {
- return rses.isUserAuthorizedToAuthor(mWebsite);
+ return mWebsite.hasUserPermissions(rses.getAuthenticatedUser(), WeblogPermission.AUTHOR);
}
} catch (Exception e) {
mLogger.warn("PageModel.isUserAuthorizedToEdit()", e);
@@ -741,7 +742,7 @@
RollerSession rses =
RollerSession.getRollerSession(mRequest);
if (rses != null && rses.getAuthenticatedUser() != null && mWebsite != null) {
- return rses.isUserAuthorizedToAdmin(mWebsite);
+ return mWebsite.hasUserPermissions(rses.getAuthenticatedUser(), WeblogPermission.ADMIN);
}
} catch (Exception e) {
mLogger.warn("PageModel.isUserAuthorizedToAdmin()", e);