0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #120

Browse source
This commit is contained in:
Shinsuke Sugaya 2014-02-23 18:03:51 +09:00
parent 51b519515f
commit 1ff8e88c81
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/jp/sf/fess/action/LoginAction.java
View file

@ -38,8 +38,9 @@ import jp.sf.fess.util.ComponentUtil;
import org.apache.struts.Globals;
import org.codelibs.core.crypto.CachedCipher;
import org.codelibs.sastruts.core.SSCConstants;
import org.codelibs.core.util.StringUtil;
import org.codelibs.sastruts.core.SSCConstants;
import org.codelibs.sastruts.core.util.ActivityUtil;
import org.seasar.struts.annotation.ActionForm;
import org.seasar.struts.annotation.Execute;
import org.seasar.struts.util.RequestUtil;
@ -148,10 +149,7 @@ public class LoginAction implements Serializable {
loginInfo.setRoleSet(roleSet);
if (loginInfo.isAdministrator()) {
if (logger.isInfoEnabled()) {
logger.info("[LOGIN] ADMIN: " + "The usename is "
+ request.getRemoteUser());
}
ActivityUtil.login(request.getRemoteUser(), request);
returnPath = (String) session.getAttribute(Constants.RETURN_PATH);
if (returnPath != null) {
@ -162,10 +160,7 @@ public class LoginAction implements Serializable {
}
} else {
if (!loginInfo.getRoleSet().isEmpty()) {
if (logger.isInfoEnabled()) {
logger.info("[LOGIN] USER: " + "The usename is "
+ request.getRemoteUser());
}
ActivityUtil.login(request.getRemoteUser(), request);
} else {
if (logger.isWarnEnabled()) {
logger.warn("Login Failure: " + request.getRemoteUser()
@ -205,10 +200,8 @@ public class LoginAction implements Serializable {
@Execute(validator = false, input = "../index")
public String logout() {
final HttpServletRequest request = RequestUtil.getRequest();
if (logger.isInfoEnabled()) {
logger.info("[LOGOUT] " + "The usename is "
+ request.getRemoteUser());
}
ActivityUtil.logout(request.getRemoteUser(), request);
final HttpSession session = request.getSession();
session.invalidate();

7
src/main/java/jp/sf/fess/action/admin/IndexAction.java
View file

@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
import jp.sf.fess.helper.SystemHelper;
import org.codelibs.sastruts.core.util.ActivityUtil;
import org.seasar.struts.annotation.Execute;
import org.seasar.struts.util.RequestUtil;
import org.slf4j.Logger;
@ -45,10 +46,8 @@ public class IndexAction {
@Execute(validator = false)
public String logout() {
final HttpServletRequest request = RequestUtil.getRequest();
if (logger.isInfoEnabled()) {
logger.info("[LOGOUT] " + "The usename is "
+ request.getRemoteUser());
}
ActivityUtil.logout(request.getRemoteUser(), request);
request.getSession().invalidate();
return "/admin/wizard/index?redirect=true";
}