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 2005/08/27 13:47:37 UTC
svn commit: r240407 [1/3] - in /incubator/roller/branches/roller_2.0:
metadata/xdoclet/ src/org/roller/presentation/
src/org/roller/presentation/bookmarks/actions/
src/org/roller/presentation/filters/ src/org/roller/presentation/planet/
src/org/roller/...
Author: snoopdave
Date: Sat Aug 27 04:46:10 2005
New Revision: 240407
URL: http://svn.apache.org/viewcvs?rev=240407&view=rev
Log:
Changes to better support multiple browser windows in same Roller session
Added:
incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp
incubator/roller/branches/roller_2.0/web/theme/css-banner.jsp
incubator/roller/branches/roller_2.0/web/theme/css-sidebar-high.jsp
incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp
incubator/roller/branches/roller_2.0/web/theme/empty.jsp
incubator/roller/branches/roller_2.0/web/theme/menu-admin.jsp
incubator/roller/branches/roller_2.0/web/theme/menu-editor.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp
Removed:
incubator/roller/branches/roller_2.0/web/theme/adminsidebar.jsp
incubator/roller/branches/roller_2.0/web/theme/editorsidebar.jsp
incubator/roller/branches/roller_2.0/web/theme/sidebar.jsp
incubator/roller/branches/roller_2.0/web/theme/styles.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp
Modified:
incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml
incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/filters/RequestFilter.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/BaseRollerMenu.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/EditorNavigationBarTag.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuItemImpl.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/RollerMenuModel.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryPageModel.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileManagerTag.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileUploadTag.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
incubator/roller/branches/roller_2.0/web/bookmarks/BookmarkForm.jsp
incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp
incubator/roller/branches/roller_2.0/web/error.jsp
incubator/roller/branches/roller_2.0/web/login-redirect.jsp
incubator/roller/branches/roller_2.0/web/login.jsp
incubator/roller/branches/roller_2.0/web/theme/banner.jsp
incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
incubator/roller/branches/roller_2.0/web/theme/head.jsp
incubator/roller/branches/roller_2.0/web/theme/layout.css
incubator/roller/branches/roller_2.0/web/theme/menu.css
incubator/roller/branches/roller_2.0/web/theme/roller.css
incubator/roller/branches/roller_2.0/web/theme/sun/colors.css
incubator/roller/branches/roller_2.0/web/theme/tan/colors.css
incubator/roller/branches/roller_2.0/web/theme/tan/two-sidebarfade.png
incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp
incubator/roller/branches/roller_2.0/web/weblog/CategoryForm.jsp
incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp
incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp
incubator/roller/branches/roller_2.0/web/weblog/referers.jsp
incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp
incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp
incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp
incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp
incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp
incubator/roller/branches/roller_2.0/web/website/upload-file.jsp
Modified: incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml Sat Aug 27 04:46:10 2005
@@ -20,45 +20,45 @@
<!-- editor/author actions -->
-<forward name="weblogEdit" path="/editor/weblog.do?method=edit&rmik=tabbedmenu.weblog.newEntry"/>
-<forward name="weblogCreate" path="/editor/weblog.do?method=create&rmik=tabbedmenu.weblog.newEntry"/>
-<forward name="weblogQuery" path="/editor/weblogQuery.do?method=query&rmik=tabbedmenu.weblog.archives"/>
-<forward name="categories" path="/editor/categories.do?method=selectCategory&rmik=tabbedmenu.weblog.categories"/>
-<forward name="bookmarks" path="/editor/bookmarks.do?method=selectFolder&rmik=tabbedmenu.bookmarks.allFolders"/>
+<forward name="weblogEdit" path="/editor/weblog.do?method=edit"/>
+<forward name="weblogCreate" path="/editor/weblog.do?method=create"/>
+<forward name="weblogQuery" path="/editor/weblogQuery.do?method=query"/>
+<forward name="categories" path="/editor/categories.do?method=selectCategory"/>
+<forward name="bookmarks" path="/editor/bookmarks.do?method=selectFolder"/>
<forward name="importBookmarks" path="/editor/importBookmarks.do"/>
-<forward name="uploadFiles" path="/editor/uploadFiles.do?rmik=tabbedmenu.website.files"/>
-<forward name="referers" path="/editor/referers.do?rmik=tabbedmenu.weblog.referers"/>
+<forward name="uploadFiles" path="/editor/uploadFiles.do"/>
+<forward name="referers" path="/editor/referers.do"/>
<!-- manage weblog actions -->
-<forward name="editWebsite" path="/editor/website.do?method=edit&rmik=tabbedmenu.website.settings"/>
-<forward name="editTheme" path="/editor/themeEditor.do?method=edit&rmik=tabbedmenu.website.themes"/>
-<forward name="editPages" path="/editor/page.do?method=editPages&rmik=tabbedmenu.website.pages"/>
+<forward name="editWebsite" path="/editor/website.do?method=edit"/>
+<forward name="editTheme" path="/editor/themeEditor.do?method=edit"/>
+<forward name="editPages" path="/editor/page.do?method=editPages"/>
<forward name="editPage" path="/editor/page.do?method=edit"/>
<forward name="removePage" path="/editor/page.do?method=remove"/>
<forward name="removePage.ok" path="/editor/page.do?method=removeOk"/>
-<forward name="memberPermissions" path="/editor/memberPermissions.do?rmik=tabbedmenu.website.members" />
+<forward name="memberPermissions" path="/editor/memberPermissions.do" />
<forward name="inviteMember" path="/editor/inviteMember.do" />
-<forward name="pingSetup" path="/editor/pingSetup.do?rmik=tabbedmenu.weblog.pingSetup" />
-<forward name="customPingTargets" path="/editor/customPingTargets.do?rmik=tabbedmenu.weblog.customPingTargets" />
+<forward name="pingSetup" path="/editor/pingSetup.do" />
+<forward name="customPingTargets" path="/editor/customPingTargets.do" />
<forward name="trackback" path="/editor/trackback.do?method=send"/>
<forward name="toggleLinkback" path="/editor/toggleLinkback.do"/>
<!-- global admin actions -->
-<forward name="rollerConfig" path="/admin/rollerConfig.do?method=edit&rmik=tabbedmenu.admin.config"/>
-<forward name="adminUser" path="/admin/user.do?method=edit&rmik=tabbedmenu.admin.userAdmin"/>
+<forward name="rollerConfig" path="/admin/rollerConfig.do?method=edit"/>
+<forward name="adminUser" path="/admin/user.do?method=edit"/>
<forward name="addUser" path="/admin/user.do?method=add"/>
-<forward name="commonPingTargets" path="/admin/commonPingTargets.do?rmik=tabbedmenu.admin.pingTargets"/>
+<forward name="commonPingTargets" path="/admin/commonPingTargets.do"/>
<!-- planet admin actions -->
-<forward name="planetConfig" path="/admin/planetConfig.do?method=getConfig&rmik=tabbedmenu.admin.planetConfig"/>
-<forward name="planetSubscriptions" path="/admin/planetSubscriptions.do?method=getSubscriptions&rmik=tabbedmenu.admin.planetSubscriptions"/>
-<forward name="planetGroups" path="/admin/planetGroups.do?method=getGroups&rmik=tabbedmenu.admin.planetGroups"/>
-<forward name="planetGroupSubscriptions" path="/admin/planetGroupSubscriptions.do?method=getGroupSubscriptions&rmik=tabbedmenu.admin.planetSubscriptions"/>
+<forward name="planetConfig" path="/admin/planetConfig.do?method=getConfig"/>
+<forward name="planetSubscriptions" path="/admin/planetSubscriptions.do?method=getSubscriptions"/>
+<forward name="planetGroups" path="/admin/planetGroups.do?method=getGroups"/>
+<forward name="planetGroupSubscriptions" path="/admin/planetGroupSubscriptions.do?method=getGroupSubscriptions"/>
</global-forwards>
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java Sat Aug 27 04:46:10 2005
@@ -12,6 +12,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.action.ActionMapping;
+import org.roller.pojos.WebsiteData;
import org.roller.presentation.util.StrutsUtil;
/**
@@ -23,10 +24,11 @@
protected static ResourceBundle bundle =
ResourceBundle.getBundle("ApplicationResources");
- private String titleKey = null;
- private HttpServletRequest request = null;
- private HttpServletResponse response = null;
- private ActionMapping mapping = null;
+ protected String titleKey = null;
+ protected HttpServletRequest request = null;
+ protected HttpServletResponse response = null;
+ protected ActionMapping mapping = null;
+ protected WebsiteData website = null;
public BasePageModel(
String titleKey,
@@ -40,8 +42,20 @@
this.titleKey = titleKey;
request.setAttribute("locales", StrutsUtil.getLocaleBeans());
request.setAttribute("timeZones", StrutsUtil.getTimeZoneBeans());
+ RollerRequest rreq = RollerRequest.getRollerRequest(request);
+ website = rreq.getWebsite();
}
+ public WebsiteData getWebsite()
+ {
+ return website;
+ }
+
+ public void setWebsite(WebsiteData website)
+ {
+ this.website = website;
+ }
+
public String getTitle()
{
return bundle.getString(titleKey);
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java Sat Aug 27 04:46:10 2005
@@ -18,12 +18,12 @@
import org.roller.config.RollerRuntimeConfig;
import org.roller.model.ParsedRequest;
import org.roller.model.RollerFactory;
-import org.roller.model.RollerFactory;
import org.roller.pojos.Template;
import org.roller.model.UserManager;
import org.roller.model.WeblogManager;
import org.roller.pojos.BookmarkData;
import org.roller.pojos.FolderData;
+import org.roller.pojos.PermissionsData;
import org.roller.pojos.UserData;
import org.roller.pojos.WeblogCategoryData;
import org.roller.pojos.WeblogEntryData;
@@ -71,31 +71,34 @@
private WebsiteData mWebsite;
private WeblogEntryData mWeblogEntry;
private WeblogCategoryData mWeblogCategory;
- private boolean mIsDateSpecified = false;
+ private boolean mIsDateSpecified = false;
private static ThreadLocal mRollerRequestTLS = new ThreadLocal();
+ public static final String WEBLOG_KEY = "weblog";
public static final String ANCHOR_KEY = "entry";
public static final String ANCHOR_KEY_OLD = "anchor";
public static final String USERNAME_KEY = "username";
- public static final String WEBSITEHANDLE_KEY = "blog";
- public static final String WEBSITEID_KEY = "websiteid";
- public static final String FOLDERID_KEY = "folderid";
- public static final String PARENTID_KEY = "parentid";
- public static final String NEWSFEEDID_KEY = "feedid";
- public static final String PAGEID_KEY = "pageid";
+
public static final String PAGELINK_KEY = "pagelink";
- public static final String PINGTARGETID_KEY = "pingtargetid";
public static final String EXCERPTS_KEY = "excerpts";
- public static final String BOOKMARKID_KEY = "bookmarkid";
- public static final String REFERERID_KEY = "refid";
- public static final String WEBLOGENTRYID_KEY = "entryid";
public static final String WEBLOGENTRY_COUNT = "count";
public static final String WEBLOGCATEGORYNAME_KEY = "catname";
- public static final String WEBLOGCATEGORYID_KEY = "catid";
public static final String WEBLOGENTRIES_KEY = "entries";
public static final String WEBLOGDAY_KEY = "day";
- public static final String WEBLOGCOMMENTID_KEY = "catid";
+
+ public static final String WEBLOGENTRYID_KEY = "entryid";
+
+ public static final String WEBLOGCATEGORYID_KEY = "catId";
+ public static final String PINGTARGETID_KEY = "pingtargetId";
+ public static final String REFERERID_KEY = "refId";
+ public static final String WEBLOGCOMMENTID_KEY = "catId";
+ public static final String WEBSITEID_KEY = "websiteId";
+ public static final String BOOKMARKID_KEY = "bookmarkId";
+ public static final String FOLDERID_KEY = "folderId";
+ public static final String PARENTID_KEY = "parentId";
+ public static final String NEWSFEEDID_KEY = "feedId";
+ public static final String PAGEID_KEY = "pageId";
public static final String LOGIN_COOKIE = "sessionId";
public static final String OWNING_WEBSITE = "OWNING_WEBSITE";
@@ -311,18 +314,22 @@
userName = mRequest.getRemoteUser();
}
+ String handle = mRequest.getParameter(RollerRequest.WEBLOG_KEY);
+ String websiteid = mRequest.getParameter(RollerRequest.WEBSITEID_KEY);
+ if (handle != null && mWebsite == null)
+ {
+ mWebsite = userMgr.getWebsiteByHandle(handle);
+ }
+ else if (websiteid != null && mWebsite == null )
+ {
+ mWebsite = userMgr.retrieveWebsite(websiteid);
+ }
+
// Look for page ID in request params
String pageId = mRequest.getParameter(RollerRequest.PAGEID_KEY);
if ( pageId != null )
{
- mPage = userMgr.retrievePage(pageId);
- /*
- // We can use page to find the user, if we don't have one yet
- if ( mWebsite == null )
- {
- mWebsite = mPage.getWebsite();
- }
- */
+ mPage = userMgr.retrievePage(pageId);
}
else if (mWebsite != null)
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java Sat Aug 27 04:46:10 2005
@@ -31,7 +31,6 @@
static final long serialVersionUID = 5890132909166913727L;
private UserData authenticatedUser = null;
- private WebsiteData currentWebsite = null;
private static Log mLogger =
LogFactory.getFactory().getInstance(RollerSession.class);
@@ -184,26 +183,10 @@
this.authenticatedUser = authenticatedUser;
}
- /**
- * Current website that user is working with.
- */
- public WebsiteData getCurrentWebsite()
- {
- return currentWebsite;
- }
-
- /**
- * Current website that user is working with.
- */
- public void setCurrentWebsite(WebsiteData currentWebsite)
- {
- this.currentWebsite = currentWebsite;
- }
-
/**
* Does our authenticated user have the global admin role?
*/
- public boolean isAdminUser() throws RollerException
+ public boolean isGlobalAdminUser() throws RollerException
{
UserData user = getAuthenticatedUser();
if (user != null && user.hasRole("admin")) return true;
@@ -213,35 +196,34 @@
/**
* Is session's authenticated user authorized to work in current website?
*/
- public boolean isUserAuthorized()
+ public boolean isUserAuthorized(WebsiteData website)
throws RollerException
{
- return hasPermissions(PermissionsData.LIMITED);
+ return hasPermissions(website, PermissionsData.LIMITED);
}
/**
* Is session's authenticated user authorized to post in current weblog?
*/
- public boolean isUserAuthorizedToAuthor()
+ public boolean isUserAuthorizedToAuthor(WebsiteData website)
throws RollerException
{
- return hasPermissions(PermissionsData.AUTHOR);
+ return hasPermissions(website, PermissionsData.AUTHOR);
}
/**
* Is session's authenticated user authorized to admin current weblog?
*/
- public boolean isUserAuthorizedToAdmin()
+ public boolean isUserAuthorizedToAdmin(WebsiteData website)
throws RollerException
{
- return hasPermissions(PermissionsData.ADMIN);
+ return hasPermissions(website, PermissionsData.ADMIN);
}
- private boolean hasPermissions(short mask)
+ private boolean hasPermissions(WebsiteData website, short mask)
{
UserData user = getAuthenticatedUser();
- WebsiteData website = getCurrentWebsite();
- if (website != null && user != null)
+ if (user != null)
{
return website.hasUserPermissions(user, mask);
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java Sat Aug 27 04:46:10 2005
@@ -17,6 +17,7 @@
import org.roller.pojos.BookmarkData;
import org.roller.pojos.FolderData;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
import org.roller.presentation.bookmarks.formbeans.BookmarkFormEx;
@@ -38,7 +39,6 @@
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
RollerSession rses = RollerSession.getRollerSession(request);
- WebsiteData wd = rses.getCurrentWebsite();
BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
BookmarkFormEx form = (BookmarkFormEx)actionForm;
@@ -53,6 +53,9 @@
// Pass bookmark's Folder on as attribute.
parentFolder = bd.getFolder();
+
+ request.setAttribute("model", new BasePageModel(
+ "bookmarkForm.edit.title", request, response, mapping));
}
else if (null != request.getParameter("correct"))
{
@@ -61,6 +64,9 @@
// Folder is specified by request param, pass it on as attribute.
parentFolder = bmgr.retrieveFolder(rreq.getFolder().getId());
+
+ request.setAttribute("model", new BasePageModel(
+ "bookmarkForm.correct.title", request, response, mapping));
}
else
{
@@ -68,7 +74,10 @@
request.setAttribute("state","add");
// Folder is specified by request param, pass it on as attribute.
- parentFolder = bmgr.retrieveFolder(rreq.getFolder().getId());
+ parentFolder = bmgr.retrieveFolder(rreq.getFolder().getId());
+
+ request.setAttribute("model", new BasePageModel(
+ "bookmarkForm.add.title", request, response, mapping));
}
// Build folder path for display on page
@@ -87,8 +96,7 @@
}
request.setAttribute("parentFolder", parentFolder);
request.setAttribute("folderPath", folderPath);
- }
-
+ }
return mapping.findForward("BookmarkForm");
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java Sat Aug 27 04:46:10 2005
@@ -66,10 +66,12 @@
HttpServletResponse response)
throws RollerException
{
- RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (RollerSession.getRollerSession(request).isUserAuthorizedToAuthor())
+ BookmarksPageModel pageModel = new BookmarksPageModel(
+ request, response, mapping, (BookmarksForm)actionForm);
+ if (RollerSession.getRollerSession(request).isUserAuthorizedToAuthor(
+ pageModel.getFolder().getWebsite()))
{
- addModelObjects(request, response, mapping, (BookmarksForm)actionForm);
+ request.setAttribute("model", pageModel);
return mapping.findForward("BookmarksForm");
}
else
@@ -95,7 +97,11 @@
throws RollerException
{
Roller roller = RollerFactory.getRoller();
- if (RollerSession.getRollerSession(request).isUserAuthorizedToAuthor())
+ BookmarksPageModel pageModel = new BookmarksPageModel(
+ request, response, mapping, (BookmarksForm)actionForm);
+ request.setAttribute("model", pageModel);
+ if (RollerSession.getRollerSession(request).isUserAuthorizedToAuthor(
+ pageModel.getFolder().getWebsite()))
{
BookmarkManager bmgr = roller.getBookmarkManager();
BookmarksForm form = (BookmarksForm)actionForm;
@@ -122,7 +128,6 @@
}
roller.commit();
- addModelObjects(request, response, mapping, (BookmarksForm)actionForm);
return mapping.findForward("BookmarksForm");
}
else
@@ -150,7 +155,11 @@
ActionMessages messages = new ActionMessages();
ActionForward forward = mapping.findForward("BookmarksForm");
Roller roller = RollerFactory.getRoller();
- if (RollerSession.getRollerSession(request).isUserAuthorizedToAuthor())
+ BookmarksPageModel pageModel = new BookmarksPageModel(
+ request, response, mapping, (BookmarksForm)actionForm);
+ request.setAttribute("model", pageModel);
+ if (RollerSession.getRollerSession(request).isUserAuthorizedToAuthor(
+ pageModel.getFolder().getWebsite()))
{
try
{
@@ -196,8 +205,6 @@
}
}
roller.commit();
-
- addModelObjects(request, response, mapping, (BookmarksForm)actionForm);
saveMessages(request, messages);
}
catch (RollerException e)
@@ -214,22 +221,6 @@
return forward;
}
- /**
- * Load model objects for display in BookmarksForm.
- * @param request
- * @throws RollerException
- */
- private void addModelObjects(
- HttpServletRequest request, HttpServletResponse response,
- ActionMapping mapping, BookmarksForm form)
- throws RollerException
- {
-
- BookmarksPageModel pageModel =
- new BookmarksPageModel(request, response, mapping, form);
- request.setAttribute("model", pageModel);
- }
-
private static final class FolderPathComparator implements Comparator
{
public int compare(Object o1, Object o2) {
@@ -263,16 +254,14 @@
super("", request, response, mapping);
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- //WebsiteData wd = rreq.getWebsite();
RollerSession rollerSession = RollerSession.getRollerSession(request);
- WebsiteData wd = rollerSession.getCurrentWebsite();
BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
allFolders = new TreeSet(new FolderPathComparator());
// Find folderid wherever it may be
- String folderId = (
- String)request.getAttribute(RollerRequest.FOLDERID_KEY);
+ String folderId = (String)
+ request.getAttribute(RollerRequest.FOLDERID_KEY);
if (null == folderId)
{
folderId = request.getParameter(RollerRequest.FOLDERID_KEY);
@@ -284,11 +273,13 @@
if (null == folderId || folderId.equals("null"))
{
- folder = bmgr.getRootFolder(wd);
+ website = rreq.getWebsite();
+ folder = bmgr.getRootFolder(website);
}
else
{
folder = bmgr.retrieveFolder(folderId);
+ website = folder.getWebsite();
}
form.setFolderId(folder.getId());
@@ -307,7 +298,7 @@
}
// Build list of all folders, except for current one, sorted by path.
- Iterator iter = bmgr.getAllFolders(wd).iterator();
+ Iterator iter = bmgr.getAllFolders(website).iterator();
// Build list of only children
//Iterator iter = folder.getFolders().iterator();
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java Sat Aug 27 04:46:10 2005
@@ -13,6 +13,7 @@
import org.roller.model.BookmarkManager;
import org.roller.model.RollerFactory;
import org.roller.pojos.FolderData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.bookmarks.formbeans.FolderFormEx;
@@ -45,6 +46,9 @@
FolderData fd = rreq.getFolder();
form.copyFrom(fd, request.getLocale());
parentFolder = fd.getParent();
+
+ request.setAttribute("model", new BasePageModel(
+ "folderForm.add.title", request, response, mapping));
}
else if (null != request.getParameter("correct"))
{
@@ -53,6 +57,9 @@
String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
parentFolder = bmgr.retrieveFolder(parentId);
+
+ request.setAttribute("model", new BasePageModel(
+ "folderForm.correct.title", request, response, mapping));
}
else
{
@@ -61,6 +68,9 @@
String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
parentFolder = bmgr.retrieveFolder(parentId);
+
+ request.setAttribute("model", new BasePageModel(
+ "folderForm.add.title", request, response, mapping));
}
request.setAttribute(RollerRequest.PARENTID_KEY, parentFolder.getId());
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java Sat Aug 27 04:46:10 2005
@@ -42,7 +42,7 @@
FolderFormEx form = (FolderFormEx)actionForm;
RollerRequest rreq = RollerRequest.getRollerRequest(request);
RollerSession rses = RollerSession.getRollerSession(request);
- WebsiteData wd = rses.getCurrentWebsite();
+ WebsiteData wd = rreq.getWebsite();
BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
FolderData fd = null;
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java Sat Aug 27 04:46:10 2005
@@ -111,7 +111,7 @@
RollerSession rses =
RollerSession.getRollerSession(request);
bm.importBookmarks(
- rses.getCurrentWebsite(), folderName, data);
+ rreq.getWebsite(), folderName, data);
RollerFactory.getRoller().commit();
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/filters/RequestFilter.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/filters/RequestFilter.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/filters/RequestFilter.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/filters/RequestFilter.java Sat Aug 27 04:46:10 2005
@@ -80,14 +80,14 @@
session.removeAttribute(RollerRequest.LOGIN_COOKIE);
UserManager mgr = RollerFactory.getRoller().getUserManager();
-
String loginCookie = mgr.createLoginCookie(username);
RollerFactory.getRoller().commit();
RequestUtil.setCookie(response, RollerRequest.LOGIN_COOKIE,
- loginCookie, request.getContextPath());
+ loginCookie, request.getContextPath());
}
}
-
+
+
}
catch (RollerException e)
{
@@ -96,7 +96,7 @@
return;
}
- if (session != null)
+ /*if (session != null)
{
// look for messages and errors in the request, and if they
// exist, stuff them in the request - in Struts 1.2, you don't
@@ -113,7 +113,7 @@
session.getAttribute(Globals.ERROR_KEY));
session.removeAttribute(Globals.ERROR_KEY);
}
- }
+ }*/
Date updateTime = null;
try
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java Sat Aug 27 04:46:10 2005
@@ -67,7 +67,7 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
BasePageModel pageModel = new BasePageModel(
"planetConfig.pageTitle", request, response, mapping);
@@ -110,7 +110,7 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
BasePageModel pageModel = new BasePageModel(
"planetConfig.pageTitle", request, response, mapping);
@@ -167,7 +167,7 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
BasePageModel pageModel = new BasePageModel(
"planetConfig.pageTitle", request, response, mapping);
@@ -204,7 +204,7 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
BasePageModel pageModel = new BasePageModel(
"planetConfig.pageTitle", request, response, mapping);
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java Sat Aug 27 04:46:10 2005
@@ -69,7 +69,7 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
Roller roller = RollerFactory.getRoller();
PlanetManager planet = roller.getPlanetManager();
@@ -108,7 +108,7 @@
ActionForward forward = mapping.findForward("planetGroups.page");
try
{
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
PlanetGroupForm form = (PlanetGroupForm)actionForm;
form.doReset(mapping, request);
@@ -138,7 +138,7 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
Roller roller = RollerFactory.getRoller();
PlanetManager planet = roller.getPlanetManager();
@@ -185,7 +185,7 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
PlanetGroupForm form = (PlanetGroupForm)actionForm;
Roller roller = RollerFactory.getRoller();
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java Sat Aug 27 04:46:10 2005
@@ -71,7 +71,7 @@
ActionForward forward = mapping.findForward("planetSubscriptions.page");
try
{
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
Roller roller = RollerFactory.getRoller();
PlanetManager planet = roller.getPlanetManager();
@@ -119,7 +119,7 @@
ActionForward forward = mapping.findForward("planetSubscriptions.page");
try
{
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
Roller roller = RollerFactory.getRoller();
PlanetManager planet = roller.getPlanetManager();
@@ -159,7 +159,7 @@
try
{
//RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
Roller roller = RollerFactory.getRoller();
PlanetManager planet = roller.getPlanetManager();
@@ -226,7 +226,7 @@
PlanetGroupData targetGroup = planet.getGroup(groupHandle);
- if (RollerSession.getRollerSession(request).isAdminUser())
+ if (RollerSession.getRollerSession(request).isGlobalAdminUser())
{
PlanetSubscriptionData sub = null;
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/BaseRollerMenu.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/BaseRollerMenu.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/BaseRollerMenu.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/BaseRollerMenu.java Sat Aug 27 04:46:10 2005
@@ -13,6 +13,7 @@
import org.roller.pojos.PermissionsData;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
import org.roller.util.Utilities;
@@ -116,7 +117,7 @@
if ( req.isUserInRole(role) || role.equals("any")
|| (role.equals("admin")
&& rollerSession != null
- && rollerSession.isAdminUser()))
+ && rollerSession.isGlobalAdminUser()))
{
ret = true;
break;
@@ -129,7 +130,14 @@
{
UserData user = null;
if (rollerSession != null) user = rollerSession.getAuthenticatedUser();
- WebsiteData website = RollerSession.getRollerSession(req).getCurrentWebsite();
+
+ WebsiteData website = rreq.getWebsite();
+ BasePageModel pageModel = (BasePageModel)req.getAttribute("model");
+ if (pageModel != null)
+ {
+ website = pageModel.getWebsite();
+ }
+
PermissionsData permsData = null;
if (user != null && website != null)
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/EditorNavigationBarTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/EditorNavigationBarTag.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/EditorNavigationBarTag.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/EditorNavigationBarTag.java Sat Aug 27 04:46:10 2005
@@ -40,7 +40,7 @@
(HttpServletRequest)pageContext.getRequest();
RollerRequest rreq = RollerRequest.getRollerRequest(request);
RollerSession rollerSession = RollerSession.getRollerSession(request);
- if ( rollerSession.isAdminUser() )
+ if ( rollerSession.isGlobalAdminUser() )
{
return super.doEndTag(pw);
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuItemImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuItemImpl.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuItemImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuItemImpl.java Sat Aug 27 04:46:10 2005
@@ -92,11 +92,7 @@
{
itemKey = (String)req.getAttribute(RollerMenuModel.MENU_ITEM_KEY);
}
- if (null == itemKey)
- {
- itemKey = (String)ses.getAttribute(mMenuId+"_"+RollerMenuModel.MENU_ITEM_KEY);
- }
-
+
if (itemKey != null && itemKey.equals(mName))
{
selected = true;
@@ -111,13 +107,17 @@
{
// Is the forward path in the request's URL?
String url = req.getRequestURL().toString();
-
- if ( url.indexOf( fConfig.getPath() ) != -1 )
+ String path = fConfig.getPath();
+ if (path != null)
+ {
+ int end = path.indexOf("?");
+ path = (end == -1) ? path : path.substring(0, end);
+ }
+ if ( url.indexOf(path) != -1 )
{
// Yes it is, so return true - this item is selected
selected = true;
- }
-
+ }
}
}
if (ses != null && selected)
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/RollerMenuModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/RollerMenuModel.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/RollerMenuModel.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/RollerMenuModel.java Sat Aug 27 04:46:10 2005
@@ -162,11 +162,10 @@
RollerRequest rreq = RollerRequest.getRollerRequest(req);
try
{
- String fid = rreq.getFolder()==null ? null : rreq.getFolder().getId();
- if ( fid != null )
- {
- params.put( RollerRequest.FOLDERID_KEY, fid );
- }
+ if (rreq.getWebsite() != null)
+ {
+ params.put(RollerRequest.WEBLOG_KEY, rreq.getWebsite().getHandle());
+ }
}
catch (Exception e)
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java Sat Aug 27 04:46:10 2005
@@ -206,7 +206,8 @@
{
RollerSession rollerSession =
RollerSession.getRollerSession(mRollerReq.getRequest());
- if ( rollerSession.isUserAuthorizedToAdmin() )
+ if ( mRollerReq.getWebsite() != null
+ && rollerSession.isUserAuthorizedToAdmin(mRollerReq.getWebsite()))
{
Hashtable params = new Hashtable();
params.put( RollerRequest.REFERERID_KEY, referer.getId());
@@ -243,9 +244,13 @@
{
try
{
- RollerSession rollerSession =
+ RollerSession rses =
RollerSession.getRollerSession(mRollerReq.getRequest());
- return rollerSession.isUserAuthorizedToAdmin();
+ if ( rses.getAuthenticatedUser() != null
+ && mRollerReq.getWebsite() != null)
+ {
+ return rses.isUserAuthorizedToAdmin(mRollerReq.getWebsite());
+ }
}
catch (Exception e)
{
@@ -429,7 +434,7 @@
}
if (mWebsite != null)
{
- params.put(RollerRequest.WEBSITEHANDLE_KEY, mWebsite.getHandle());
+ params.put(RollerRequest.WEBLOG_KEY, mWebsite.getHandle());
}
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java Sat Aug 27 04:46:10 2005
@@ -509,7 +509,7 @@
{
List refs =
mRefererMgr.getReferersToDate(mRollerReq.getWebsite(), date);
- RollerSession rollerSession =
+ RollerSession rses =
RollerSession.getRollerSession(mRollerReq.getRequest());
for (Iterator rdItr = refs.iterator(); rdItr.hasNext();) {
@@ -520,7 +520,7 @@
&& StringUtils.isNotEmpty(excerpt) )
{
if ( referer.getVisible().booleanValue()
- || rollerSession.isUserAuthorizedToAdmin() )
+ || rses.isUserAuthorizedToAdmin(referer.getWebsite()) )
{
referers.add(RefererDataWrapper.wrap(referer));
}
@@ -746,9 +746,13 @@
{
try
{
- RollerSession rollerSession =
+ RollerSession rses =
RollerSession.getRollerSession(mRollerReq.getRequest());
- return rollerSession.isUserAuthorizedToAdmin();
+ if (rses.getAuthenticatedUser() != null
+ && mRollerReq.getWebsite() != null)
+ {
+ return rses.isUserAuthorizedToAdmin(mRollerReq.getWebsite());
+ }
}
catch (Exception e)
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java Sat Aug 27 04:46:10 2005
@@ -415,7 +415,7 @@
private boolean checkForWebsite(HttpServletRequest request)
{
if (StringUtils.isNotEmpty(
- request.getParameter(RollerRequest.WEBSITEHANDLE_KEY)))
+ request.getParameter(RollerRequest.WEBLOG_KEY)))
{
return true;
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java Sat Aug 27 04:46:10 2005
@@ -64,12 +64,12 @@
HttpServletResponse response)
throws RollerException
{
- RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rollerSession = RollerSession.getRollerSession(
- rreq.getRequest());
- if (rollerSession.isUserAuthorizedToAuthor())
+ CategoriesPageModel pageModel = new CategoriesPageModel(
+ request, response, mapping, (CategoriesForm)actionForm);
+ RollerSession rses = RollerSession.getRollerSession(request);
+ if (rses.isUserAuthorizedToAuthor(pageModel.getCategory().getWebsite()))
{
- addModelObjects(request, response, mapping, (CategoriesForm)actionForm);
+ request.setAttribute("model", pageModel);
return mapping.findForward("CategoriesForm");
}
else
@@ -96,11 +96,14 @@
{
ActionMessages messages = new ActionMessages();
ActionForward forward = mapping.findForward("CategoriesForm");
- RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rollerSession = RollerSession.getRollerSession(
- rreq.getRequest());
- if (rollerSession.isUserAuthorizedToAuthor())
+
+ CategoriesPageModel pageModel = new CategoriesPageModel(
+ request, response, mapping, (CategoriesForm)actionForm);
+
+ RollerSession rses = RollerSession.getRollerSession(request);
+ if (rses.isUserAuthorizedToAuthor(pageModel.getCategory().getWebsite()))
{
+ request.setAttribute("model", pageModel);
try
{
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
@@ -133,11 +136,8 @@
"categoriesForm.warn.notMoving",cd.getName()));
}
}
- }
-
+ }
RollerFactory.getRoller().commit();
-
- addModelObjects(request, response, mapping, (CategoriesForm)actionForm);
saveMessages(request, messages);
}
catch (RollerException e)
@@ -154,21 +154,6 @@
return forward;
}
- /**
- * Load model objects for display in CategoriesForm.
- * @param request
- * @throws RollerException
- */
- private void addModelObjects(
- HttpServletRequest request, HttpServletResponse response,
- ActionMapping mapping, CategoriesForm form)
- throws RollerException
- {
- CategoriesPageModel pageModel =
- new CategoriesPageModel(request, response, mapping, form);
- request.setAttribute("model",pageModel);
- }
-
private static final class CategoryPathComparator implements Comparator
{
public int compare(Object o1, Object o2) {
@@ -200,8 +185,6 @@
this.form = form;
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- WebsiteData wd =
- RollerSession.getRollerSession(request).getCurrentWebsite();
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
allCategories = new TreeSet(new CategoryPathComparator());
@@ -221,11 +204,12 @@
cat = null;
if (null == catId || catId.equals("null"))
{
- cat = wmgr.getRootWeblogCategory(wd);
+ cat = wmgr.getRootWeblogCategory(website);
}
else
{
- cat = wmgr.retrieveWeblogCategory(catId);
+ cat = wmgr.retrieveWeblogCategory(catId);
+ website = cat.getWebsite();
}
form.setId(cat.getId());
@@ -249,7 +233,7 @@
// Build collection of all Categories, except for current one,
// sorted by path.
- Iterator iter = wmgr.getWeblogCategories(wd).iterator();
+ Iterator iter = wmgr.getWeblogCategories(website).iterator();
while (iter.hasNext())
{
WeblogCategoryData cd = (WeblogCategoryData) iter.next();
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java Sat Aug 27 04:46:10 2005
@@ -39,15 +39,14 @@
{
ActionForward forward = null;
CategoryDeleteForm form = (CategoryDeleteForm)actionForm;
- RollerRequest rreq = RollerRequest.getRollerRequest(request);
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
- RollerSession rollerSession = RollerSession.getRollerSession(
- rreq.getRequest());
- if (rollerSession.isUserAuthorizedToAuthor())
- {
- String catid = request.getParameter("catid");
- WeblogCategoryData catToDelete =
+
+ String catid = request.getParameter("catid");
+ WeblogCategoryData catToDelete =
wmgr.retrieveWeblogCategory(catid);
+ RollerSession rses = RollerSession.getRollerSession(request);
+ if (rses.isUserAuthorizedToAuthor(catToDelete.getWebsite()))
+ {
String returnId = null;
if (catToDelete.getParent() != null)
{
@@ -56,7 +55,8 @@
if (form.isDelete() == null)
{
// Present CategoryDeleteOK? page to user
- WebsiteData website = RollerSession.getRollerSession(request).getCurrentWebsite();
+ RollerRequest rreq = RollerRequest.getRollerRequest(request);
+ WebsiteData website = rreq.getWebsite();
WeblogCategoryData theCat = wmgr.retrieveWeblogCategory(catid);
Iterator allCats =
wmgr.getWeblogCategories(website).iterator();
@@ -111,7 +111,7 @@
request.setAttribute(
RollerRequest.WEBLOGCATEGORYID_KEY, returnId);
}
- forward = mapping.findForward("Categories");
+ forward = mapping.findForward("categories");
}
else
{
@@ -121,7 +121,7 @@
request.setAttribute(
RollerRequest.WEBLOGCATEGORYID_KEY, returnId);
}
- forward = mapping.findForward("Categories");
+ forward = mapping.findForward("categories");
}
}
else
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java Sat Aug 27 04:46:10 2005
@@ -16,6 +16,7 @@
import org.roller.model.WeblogManager;
import org.roller.pojos.WeblogCategoryData;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
import org.roller.presentation.weblog.formbeans.WeblogCategoryFormEx;
@@ -36,10 +37,10 @@
throws Exception
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- WebsiteData wd = RollerSession.getRollerSession(request).getCurrentWebsite();
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
WeblogCategoryFormEx form = (WeblogCategoryFormEx)actionForm;
+ BasePageModel pageModel = null;
WeblogCategoryData parentCat = null;
if (null!=rreq.getWeblogCategory() && null==request.getParameter("correct"))
{
@@ -48,21 +49,22 @@
WeblogCategoryData cd = rreq.getWeblogCategory();
form.copyFrom(cd, request.getLocale());
request.setAttribute("state","edit");
-
- // Pass Category's parent id on as attribute.
- parentCat = cd.getParent();
- request.setAttribute(
- RollerRequest.WEBLOGCATEGORYID_KEY, parentCat.getId());
+
+ parentCat = cd.getParent();
+ pageModel = new BasePageModel(
+ "categoryForm.edit.title", request, response, mapping);
+ pageModel.setWebsite(cd.getWebsite());
}
else if (null != request.getParameter("correct"))
{
// We are correcting a previously submtted form.
- request.setAttribute("state","correcting");
-
- // Cat is specified by request param, pass it on as attribute.
- parentCat = wmgr.retrieveWeblogCategory(rreq.getWeblogCategory().getId());
- request.setAttribute(
- RollerRequest.WEBLOGCATEGORYID_KEY, parentCat.getId());
+ // already submitted form then load that Category into the form.
+ WeblogCategoryData cd = rreq.getWeblogCategory();
+ request.setAttribute("state","correcting");
+
+ parentCat = wmgr.retrieveWeblogCategory(rreq.getWeblogCategory().getId());
+ pageModel = new BasePageModel(
+ "categoryForm.correct.title", request, response, mapping);
}
else
{
@@ -71,7 +73,10 @@
// Cat is specified by request param, pass it on as attribute.
String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
- form.setParentId(parentId);
+ form.setParentId(parentId);
+
+ pageModel = new BasePageModel(
+ "categoryForm.add.title", request, response, mapping);
}
// Build cat path for display on page
@@ -88,7 +93,8 @@
request.setAttribute("parentCategory", parentCat);
request.setAttribute("categoryPath", categoryPath);
}
-
+
+ request.setAttribute("model", pageModel);
return mapping.findForward("CategoryForm");
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategorySaveAction.java Sat Aug 27 04:46:10 2005
@@ -53,7 +53,7 @@
else
{
cd = wmgr.createWeblogCategory();
- cd.setWebsite(RollerSession.getRollerSession(request).getCurrentWebsite());
+ cd.setWebsite(rreq.getWebsite());
String parentId = form.getParentId();
cd.setParent(wmgr.retrieveWeblogCategory(parentId));
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java Sat Aug 27 04:46:10 2005
@@ -78,7 +78,7 @@
req.setAttribute("allowCustomTargets", allowCustomTargets);
List customPingTargets = allowCustomTargets.booleanValue() ?
- pingTargetMgr.getCustomPingTargets(RollerSession.getRollerSession(req).getCurrentWebsite()) : Collections.EMPTY_LIST;
+ pingTargetMgr.getCustomPingTargets(rreq.getWebsite()) : Collections.EMPTY_LIST;
return customPingTargets;
}
@@ -92,7 +92,7 @@
PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
return pingTargetMgr.createCustomPingTarget(
pingTargetForm.getName(), pingTargetForm.getPingUrl(),
- RollerSession.getRollerSession(rreq.getRequest()).getCurrentWebsite());
+ rreq.getWebsite());
}
@@ -101,8 +101,9 @@
*/
protected boolean hasRequiredRights(RollerRequest rreq) throws RollerException
{
- RollerSession rollerSession = RollerSession.getRollerSession(rreq.getRequest());
- return (rollerSession.isUserAuthorizedToAdmin() && !PingConfig.getDisallowCustomTargets());
+ RollerSession rses = RollerSession.getRollerSession(rreq.getRequest());
+ return (rses.isUserAuthorizedToAdmin(rreq.getWebsite())
+ && !PingConfig.getDisallowCustomTargets());
}
public ActionForward cancel(
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java Sat Aug 27 04:46:10 2005
@@ -87,8 +87,10 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rollerSession = RollerSession.getRollerSession(rreq.getRequest());
- if ( !rollerSession.isUserAuthorizedToAdmin() )
+ RollerSession rses =
+ RollerSession.getRollerSession(rreq.getRequest());
+ if ( rreq.getWebsite() == null
+ || !rses.isUserAuthorizedToAdmin(rreq.getWebsite()))
{
forward = mapping.findForward("access-denied");
}
@@ -128,9 +130,10 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rollerSession = RollerSession.getRollerSession(rreq.getRequest());
+ RollerSession rses = RollerSession.getRollerSession(rreq.getRequest());
WeblogQueryForm form = (WeblogQueryForm)actionForm;
- if ( rollerSession.isUserAuthorizedToAdmin() )
+ if ( rreq.getWebsite() != null
+ && rses.isUserAuthorizedToAdmin(rreq.getWebsite()) )
{
request.setAttribute("model",
new BasePageModel("", request, response, mapping));
@@ -160,7 +163,7 @@
//System.out.println("Export: got " + entries.size() + " entries.");
List entries = weblogMgr.getWeblogEntries(
- RollerSession.getRollerSession(request).getCurrentWebsite(), // userName
+ rreq.getWebsite(), // userName
startDate, // startDate
endDate, // endDate
null, // catName
@@ -173,7 +176,7 @@
Map entryMap = seperateByPeriod(entries, form.getFileBy());
// now export each List in the entryMap
- ExportRss exporter = new ExportRss(RollerSession.getRollerSession(request).getCurrentWebsite());
+ ExportRss exporter = new ExportRss(rreq.getWebsite());
String exportTo = form.getExportFormat().toLowerCase();
if ("atom".equals(exportTo))
{
@@ -275,7 +278,8 @@
JspFactory.getDefaultFactory().getPageContext(
this.getServlet(), request, response, "", true, 8192, true);
Map params = new HashMap();
- params.put( RollerRequest.WEBSITEHANDLE_KEY, RollerSession.getRollerSession(request).getCurrentWebsite().getHandle());
+ params.put( RollerRequest.WEBLOG_KEY,
+ rreq.getWebsite().getHandle());
params.put("rmik", "Files");
String filesLink = RequestUtils.computeURL(
pageContext, (String)null, (String)null, (String)null,
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java Sat Aug 27 04:46:10 2005
@@ -52,7 +52,8 @@
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
RollerSession rollerSession = RollerSession.getRollerSession(rreq.getRequest());
- if ( !rollerSession.isUserAuthorizedToAdmin() )
+ if ( rreq.getWebsite() == null
+ || !rollerSession.isUserAuthorizedToAdmin(rreq.getWebsite()))
{
forward = mapping.findForward("access-denied");
}
@@ -63,10 +64,11 @@
if (StringUtils.isNotEmpty(form.getImportFileName()))
{
// "default" values
- WebsiteData website = RollerSession.getRollerSession(request).getCurrentWebsite();
+ WebsiteData website = rreq.getWebsite();
// load selected file
- ServletContext app = this.getServlet().getServletConfig().getServletContext();
+ ServletContext app =
+ getServlet().getServletConfig().getServletContext();
String dir = RollerContext.getUploadDir( app );
File f = new File(dir + website.getHandle() +
"/" + form.getImportFileName());
@@ -128,9 +130,9 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rollerSession = RollerSession.getRollerSession(
- rreq.getRequest());
- if ( !rollerSession.isUserAuthorizedToAdmin() )
+ RollerSession rses = RollerSession.getRollerSession(request);
+ if ( rreq.getWebsite() == null
+ || !rses.isUserAuthorizedToAdmin(rreq.getWebsite()) )
{
forward = mapping.findForward("access-denied");
}
@@ -151,7 +153,7 @@
{
ServletContext app = this.getServlet().getServletConfig().getServletContext();
String dir = RollerContext.getUploadDir( app );
- File d = new File(dir + RollerSession.getRollerSession(rreq.getRequest()).getCurrentWebsite().getHandle());
+ File d = new File(dir + rreq.getWebsite().getHandle());
ArrayList xmlFiles = new ArrayList();
if (d.mkdirs() || d.exists())
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java Sat Aug 27 04:46:10 2005
@@ -89,7 +89,7 @@
ActionForward forward = mapping.findForward(PING_SETUP_PAGE);
RollerRequest rreq = RollerRequest.getRollerRequest(req);
PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
- WebsiteData website = RollerSession.getRollerSession(req).getCurrentWebsite();
+ WebsiteData website = rreq.getWebsite();
try
{
if (!isAuthorized(rreq))
@@ -132,7 +132,7 @@
throws RollerException
{
AutoPingManager autoPingMgr = RollerFactory.getRoller().getAutopingManager();
- WebsiteData website = RollerSession.getRollerSession(rreq.getRequest()).getCurrentWebsite();
+ WebsiteData website = rreq.getWebsite();
// Build isEnabled map (keyed by ping target id and values Boolean.TRUE/Boolean.FALSE)
Map isEnabled = new HashMap();
@@ -182,7 +182,7 @@
}
PingTargetData pingTarget = select(rreq);
AutoPingData autoPing = autoPingMgr.createAutoPing(pingTarget,
- RollerSession.getRollerSession(req).getCurrentWebsite());
+ rreq.getWebsite());
autoPingMgr.storeAutoPing(autoPing);
RollerFactory.getRoller().commit();
@@ -211,8 +211,7 @@
return mapping.findForward("access-denied");
}
PingTargetData pingTarget = select(rreq);
- autoPingMgr.removeAutoPing(pingTarget,
- RollerSession.getRollerSession(req).getCurrentWebsite());
+ autoPingMgr.removeAutoPing(pingTarget, rreq.getWebsite());
RollerFactory.getRoller().commit();
return view(mapping, form, req, res);
@@ -236,7 +235,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest(req);
String absoluteUrl = RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
PingTargetData pingTarget = select(rreq);
- WebsiteData website = RollerSession.getRollerSession(req).getCurrentWebsite();
+ WebsiteData website = rreq.getWebsite();
try
{
if (!isAuthorized(rreq))
@@ -337,7 +336,8 @@
private boolean isAuthorized(RollerRequest rreq) throws RollerException
{
- RollerSession rollerSession = RollerSession.getRollerSession(rreq.getRequest());
- return rollerSession.isUserAuthorizedToAdmin() && !PingConfig.getDisablePingUsage();
+ RollerSession rses = RollerSession.getRollerSession(rreq.getRequest());
+ return rses.isUserAuthorizedToAdmin(rreq.getWebsite())
+ && !PingConfig.getDisablePingUsage();
}
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java Sat Aug 27 04:46:10 2005
@@ -60,18 +60,19 @@
RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
try
{
- if ( rollerSession.isUserAuthorizedToAuthor() )
+ if (rreq.getWebsite() != null
+ && rollerSession.isUserAuthorizedToAuthor(rreq.getWebsite()) )
{
BasePageModel pageModel = new BasePageModel(
"referers.todaysReferers", req, res, mapping);
req.setAttribute("model", pageModel);
req.setAttribute("pageHits",
- new Integer(refmgr.getDayHits(RollerSession.getRollerSession(req).getCurrentWebsite())));
+ new Integer(refmgr.getDayHits(rreq.getWebsite())));
req.setAttribute("totalHits",
- new Integer(refmgr.getTotalHits(RollerSession.getRollerSession(req).getCurrentWebsite())));
+ new Integer(refmgr.getTotalHits(rreq.getWebsite())));
- List refs = refmgr.getTodaysReferers(RollerSession.getRollerSession(req).getCurrentWebsite());
+ List refs = refmgr.getTodaysReferers(rreq.getWebsite());
req.setAttribute("referers",refs);
}
}
@@ -94,10 +95,11 @@
RollerSession rollerSession = RollerSession.getRollerSession(req);
try
{
- if ( rollerSession.isUserAuthorizedToAuthor() )
+ if (rreq.getWebsite() != null
+ && rollerSession.isUserAuthorizedToAuthor(rreq.getWebsite()) )
{
RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
- WebsiteData website = RollerSession.getRollerSession(req).getCurrentWebsite();
+ WebsiteData website = rreq.getWebsite();
refmgr.forceTurnover(website.getId());
RollerFactory.getRoller().commit();
}
@@ -121,10 +123,11 @@
RollerSession rollerSession = RollerSession.getRollerSession(req);
try
{
- if (rollerSession.isUserAuthorizedToAuthor() )
+ if (rreq.getWebsite() != null
+ && rollerSession.isUserAuthorizedToAuthor(rreq.getWebsite()) )
{
RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
- WebsiteData website = RollerSession.getRollerSession(req).getCurrentWebsite();
+ WebsiteData website = rreq.getWebsite();
String[] deleteIds = req.getParameterValues("id");
if (deleteIds != null)
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java Sat Aug 27 04:46:10 2005
@@ -41,7 +41,8 @@
RollerSession rollerSession = RollerSession.getRollerSession(req);
try
{
- if ( rollerSession.isUserAuthorizedToAuthor() )
+ if (rreq.getWebsite() != null
+ && rollerSession.isUserAuthorizedToAuthor(rreq.getWebsite()) )
{
String refid = req.getParameter(RollerRequest.REFERERID_KEY);
if ( refid != null )
@@ -56,7 +57,7 @@
RollerFactory.getRoller().commit();
- PageCacheFilter.removeFromCache( req, RollerSession.getRollerSession(req).getCurrentWebsite() );
+ PageCacheFilter.removeFromCache( req, rreq.getWebsite() );
}
}
}
@@ -72,7 +73,7 @@
{
RollerContext rctx = RollerContext.getRollerContext(
rreq.getServletContext());
- url = rctx.getContextUrl( req, RollerSession.getRollerSession(req).getCurrentWebsite());
+ url = rctx.getContextUrl( req, rreq.getWebsite());
res.sendRedirect(url);
}
catch (Exception e)