From 02e32428bddeb5ae05bd8a5e6aacb41145ce68a5 Mon Sep 17 00:00:00 2001 From: jeb228 Date: Wed, 13 Oct 2010 15:54:11 +0000 Subject: [PATCH] NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. --- webapp/web/themes/default/jsp/footer.jsp | 29 ++++------------- webapp/web/themes/default/jsp/identity.jsp | 36 +++------------------ webapp/web/themes/default/jsp/menu.jsp | 16 +++------ webapp/web/themes/enhanced/jsp/footer.jsp | 17 ---------- webapp/web/themes/enhanced/jsp/identity.jsp | 17 ++++------ webapp/web/themes/enhanced/jsp/menu.jsp | 21 ++++-------- 6 files changed, 30 insertions(+), 106 deletions(-) diff --git a/webapp/web/themes/default/jsp/footer.jsp b/webapp/web/themes/default/jsp/footer.jsp index 846a99e4f..7cef9098f 100644 --- a/webapp/web/themes/default/jsp/footer.jsp +++ b/webapp/web/themes/default/jsp/footer.jsp @@ -7,19 +7,10 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.*"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %> +<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %> - - <% - /** - * @version 1.00 - * @author Jon Corson-Rikert - * UPDATES: - * 2006-01-04 bdc removed and tags and moved from to
- * 2005-07-07 JCR included LoginFormBean so can substitute filterbrowse for portalbrowse for authorized users - */ - final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.themes.default.footer.jsp"); VitroRequest vreq = new VitroRequest(request); @@ -28,14 +19,8 @@ if (portal==null) { log.error("portal from vreq.getPortal() null in themes/default/footer.jsp"); } - HttpSession currentSession = request.getSession(); - - boolean authorized = false; - if (loginHandler.getLoginStatus().equals("authenticated")) /* test if session is still valid */ - if (currentSession.getId().equals(loginHandler.getSessionId())) - if (request.getRemoteAddr().equals( - loginHandler.getLoginRemoteAddr())) - authorized = true; + + boolean isEditor = LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.EDITOR); %>
@@ -43,14 +28,14 @@ if (rootBreadCrumb != null && rootBreadCrumb.length()>0) { %> <%=rootBreadCrumb%> | <% } %> - ?home=<%=portal.getPortalId()%>">Index - | Contact Us - + Index + | Contact Us + <% if (isEditor) { %> | admin [ validate xhtml validate css ] - + <% } %>
<% if (portal.getCopyrightAnchor() != null && portal.getCopyrightAnchor().length()>0) { %>
diff --git a/webapp/web/themes/default/jsp/identity.jsp b/webapp/web/themes/default/jsp/identity.jsp index 4e49bc929..386a75936 100644 --- a/webapp/web/themes/default/jsp/identity.jsp +++ b/webapp/web/themes/default/jsp/identity.jsp @@ -6,47 +6,21 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> +<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%><%/* this odd thing points to something in web.xml */ %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.PortalWebUtil" %> - <% - /** - * - * @version 1.00 - * @author Jon Corson-Rikert, Brian Caruso, and Brian Lowe - * - * UPDATES: - * 2007-09-27 BJL moved VIVO and CALS-specific markup to VIVO clone - * 2006-01-31 BJL edited to remove deprecated markup - * 2005-11-06 JCR put styling on extra search selection box - * 2005-10-25 JCR changed local ALL CALS RESEARCH constant to appBean.getSharedPortalFlagNumeric() - * 2005-10-11 JCR tweaks to VIVO search label spacing in header - * 2005-09-15 JCR,BDC converted to use revised ApplicationBean and PortalBean - * 2005-08-16 JCR added CALS_IMPACT contant and modified code to use CALS display for that portal - * 2005-08-01 JCR changed ordering of other portals being displayed to displayRank instead of appName (affects SGER, CALS portals) - * 2005-07-05 JCR retrieving ONLY_CURRENT and ONLY_PUBLIC from database and setting in ApplicationBean - * 2005-06-20 JCR enabling a common CALS research portal via ALL CALS RESEARCH - * 2005-06-20 JCR removed MIN_STATUS_ID and minstatus parameter from search -- has been changed to interactive-only maxstatus parameter - * JCR 2005-06-14 : added isInitialized() test for appBean and portalBean - */ - // application variables not stored in application bean final int CALS_IMPACT = 6; - final int FILTER_SECURITY_LEVEL = 4; final int CALS_SEARCHBOX_SIZE = 25; final int VIVO_SEARCHBOX_SIZE = 20; - HttpSession currentSession = request.getSession(); - String currentSessionIdStr = currentSession.getId(); - int securityLevel = -1; - String loginName = null; - if (loginHandler.testSessionLevel(request) > -1) { - securityLevel = Integer.parseInt(loginHandler.getLoginRole()); - loginName = loginHandler.getLoginName(); - } + LoginStatusBean loginBean = LoginStatusBean.getBean(request); + boolean isEditor = loginBean.isLoggedInAtLeast(LoginStatusBean.EDITOR); + String loginName = loginBean.getUsername(); VitroRequest vreq = new VitroRequest(request); ApplicationBean appBean = vreq.getAppBean(); @@ -106,7 +80,7 @@
-<% if (securityLevel>=FILTER_SECURITY_LEVEL && appBean.isFlag1Active()) { %> +<% if (isEditor && appBean.isFlag1Active()) { %> to
- * 2005-07-07 JCR included LoginFormBean so can substitute filterbrowse for portalbrowse for authorized users - */ - final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.themes.enhanced.footer.jsp"); VitroRequest vreq = new VitroRequest(request); @@ -30,14 +21,6 @@ if (portal==null) { log.error("portal from vreq.getPortal() null in themes/enhanced/footer.jsp"); } - HttpSession currentSession = request.getSession(); - - boolean authorized = false; - if (loginHandler.getLoginStatus().equals("authenticated")) /* test if session is still valid */ - if (currentSession.getId().equals(loginHandler.getSessionId())) - if (request.getRemoteAddr().equals( - loginHandler.getLoginRemoteAddr())) - authorized = true; %> diff --git a/webapp/web/themes/enhanced/jsp/identity.jsp b/webapp/web/themes/enhanced/jsp/identity.jsp index 75f7dd5af..27c0fab41 100644 --- a/webapp/web/themes/enhanced/jsp/identity.jsp +++ b/webapp/web/themes/enhanced/jsp/identity.jsp @@ -10,20 +10,15 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> +<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> - - <% - HttpSession currentSession = request.getSession(); - String currentSessionIdStr = currentSession.getId(); - int securityLevel = -1; - String loginName = null; - if (loginHandler.testSessionLevel(request) > -1) { - securityLevel = Integer.parseInt(loginHandler.getLoginRole()); - loginName = loginHandler.getLoginName(); - } + LoginStatusBean loginBean = LoginStatusBean.getBean(request); + boolean isLoggedIn = loginBean.isLoggedIn(); + String loginName = loginBean.getUsername(); + // VITRO FILE final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.menu.jsp"); @@ -74,7 +69,7 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
    <%-- A user is logged in --%> - <% if (securityLevel > 0) { %> + <% if (isLoggedIn) { %> diff --git a/webapp/web/themes/enhanced/jsp/menu.jsp b/webapp/web/themes/enhanced/jsp/menu.jsp index f371d1038..9eff4621d 100755 --- a/webapp/web/themes/enhanced/jsp/menu.jsp +++ b/webapp/web/themes/enhanced/jsp/menu.jsp @@ -10,12 +10,12 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.web.TabWebUtil" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.web.PortalWebUtil" %> -<%@page import="java.util.List"%> +<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %> +<%@ page import="java.util.List"%> + <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> - - <% /*********************************************** Make the Tab menu list and search block @@ -57,22 +57,15 @@ // application variables not stored in application bean final String DEFAULT_SEARCH_METHOD = "fulltext"; - final int FILTER_SECURITY_LEVEL = 4; final int VIVO_SEARCHBOX_SIZE = 20; ApplicationBean appBean = vreq.getAppBean(); PortalWebUtil.populateSearchOptions(portal, appBean, vreq.getWebappDaoFactory().getPortalDao()); PortalWebUtil.populateNavigationChoices(portal, request, appBean, vreq.getWebappDaoFactory().getPortalDao()); - HttpSession currentSession = request.getSession(); - String currentSessionIdStr = currentSession.getId(); - int securityLevel = -1; - String loginName = null; - if (loginHandler.testSessionLevel(request) > -1) { - securityLevel = Integer.parseInt(loginHandler.getLoginRole()); - loginName = loginHandler.getLoginName(); - } - + LoginStatusBean loginBean = LoginStatusBean.getBean(request); + boolean isEditor = loginBean.isLoggedInAtLeast(LoginStatusBean.EDITOR); + String loginName = loginBean.getUsername(); %> @@ -118,7 +111,7 @@
    - <% if (securityLevel>=FILTER_SECURITY_LEVEL && appBean.isFlag1Active()) { %> + <% if (isEditor && appBean.isFlag1Active()) { %>