Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r54a14306d3b36e6da9aedbaa6700c91048ebc53a -re70265399b27db25b5aab184cdc8b1588eb75658 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 54a14306d3b36e6da9aedbaa6700c91048ebc53a) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e70265399b27db25b5aab184cdc8b1588eb75658) @@ -512,6 +512,7 @@ sysadmin.maintain.session =Logged in users sysadmin.maintain.session.login =Login sysadmin.maintain.session.id =Session ID +sysadmin.maintain.session.name =Name error.portrait.removal.failed =Unable to delete portrait. See error file for details label.delete.portrait =Delete portrait sysadmin.maintain.session.delete =Delete Index: lams_admin/web/sessionmaintain.jsp =================================================================== diff -u -r21991bdc561db26de7c7e0687a10b2c2d7743074 -re70265399b27db25b5aab184cdc8b1588eb75658 --- lams_admin/web/sessionmaintain.jsp (.../sessionmaintain.jsp) (revision 21991bdc561db26de7c7e0687a10b2c2d7743074) +++ lams_admin/web/sessionmaintain.jsp (.../sessionmaintain.jsp) (revision e70265399b27db25b5aab184cdc8b1588eb75658) @@ -5,13 +5,15 @@ + - + +
Index: lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java =================================================================== diff -u -rf2c0865cbb95219b30d59d6152b20dff389dc7b0 -re70265399b27db25b5aab184cdc8b1588eb75658 --- lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java (.../SessionManager.java) (revision f2c0865cbb95219b30d59d6152b20dff389dc7b0) +++ lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java (.../SessionManager.java) (revision e70265399b27db25b5aab184cdc8b1588eb75658) @@ -23,6 +23,8 @@ package org.lamsfoundation.lams.web.session; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; @@ -32,6 +34,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.web.util.AttributeNames; + public class SessionManager { public static final String SYS_SESSION_COOKIE = "JSESSIONID"; // if this attribute is set in session, next call will force the user to log out @@ -204,10 +209,16 @@ /** * Lists all logins with their assigned sessions */ - public static Map getLoginToSessionIDMappings() { - Map result = new TreeMap(); + public static Map> getLoginToSessionIDMappings() { + Map> result = new TreeMap>(); for (Entry entry : loginMapping.entrySet()) { - result.put(entry.getKey(), entry.getValue().getId()); + HttpSession session = entry.getValue(); + UserDTO user = (UserDTO) session.getAttribute(AttributeNames.USER); + List sessionInfo = new LinkedList(); + sessionInfo.add(user.getFirstName()); + sessionInfo.add(user.getLastName()); + sessionInfo.add(session.getId()); + result.put(entry.getKey(), sessionInfo); } return result; }