fixed / clean ups

[mir.git] / source / Mir.java

diff --git a/source/Mir.java b/source/Mir.java
index 7043046..d367342 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -57,7 +57,6 @@ import mir.util.ExceptionFunctions;
 import mir.util.StringRoutines;
 import mircoders.entity.EntityUsers;
 import mircoders.global.MirGlobal;
-import mircoders.module.ModuleMessage;
 import mircoders.module.ModuleUsers;
 import mircoders.servlet.ServletHelper;
 import mircoders.storage.DatabaseUsers;
@@ -70,13 +69,12 @@ import org.apache.struts.util.MessageResources;
 /**
  * Mir.java - main servlet, that dispatches to servletmodules
  *
- * @author $Author: rk $
- * @version $Id: Mir.java,v 1.49.2.8 2003/10/23 14:55:26 rk Exp $
+ * @author $Author: zapata $
+ * @version $Id: Mir.java,v 1.49.2.11 2004/01/18 17:30:56 zapata Exp $
  *
  */
 public class Mir extends AbstractServlet {
   private static ModuleUsers usersModule = null;
-  private static ModuleMessage messageModule = null;
   private final static Map servletModuleInstanceHash = new HashMap();
   private static Locale fallbackLocale = null;
 
@@ -169,7 +167,8 @@ public class Mir extends AbstractServlet {
 
         if (user!=null) {
           ServletHelper.setUser(aRequest, user);
-          aRequest.getSession().setAttribute("sessiontracker", new SessionTracker(username));
+          usersModule.recordLogin(user);
+          aRequest.getSession().setAttribute("sessiontracker", new SessionTracker(username, user.getId()));
         }
       }
 
@@ -189,7 +188,6 @@ public class Mir extends AbstractServlet {
 
       HttpSession session = aRequest.getSession(true);
       setNoCaching(aResponse);
-      Locale locale = new Locale(getDefaultLanguage(aRequest), "");
       aResponse.setContentType("text/html; charset=" +
                                configuration.
                                getString("Mir.DefaultHTMLCharset", "UTF-8"));
@@ -227,7 +225,7 @@ public class Mir extends AbstractServlet {
           }
         }
         else if (moduleName.equals("logout")) {
-          logger.info(userEntity.getValue("login") + " has logged out");
+          logger.info(userEntity.getFieldValue("login") + " has logged out");
           session.invalidate();
           _sendLoginPage(aResponse, aRequest);
           return;
@@ -360,17 +358,19 @@ public class Mir extends AbstractServlet {
 
   private class SessionTracker implements HttpSessionBindingListener {
     private String name;
+    private String id;
 
-    public SessionTracker(String aUserName) {
+    public SessionTracker(String aUserName, String anId) {
       name = aUserName;
+      id = anId;
     }
 
     public void valueBound(HttpSessionBindingEvent anEvent) {
-      MirGlobal.registerLogin(name);
+      MirGlobal.registerLogin(name, id);
     }
 
     public void valueUnbound(HttpSessionBindingEvent anEvent) {
-      MirGlobal.registerLogout(name);
+      MirGlobal.registerLogout(name, id);
     }
   }
 }