fixed / clean ups

[mir.git] / source / mircoders / module / ModuleUsers.java

diff --git a/source/mircoders/module/ModuleUsers.java b/source/mircoders/module/ModuleUsers.java
index 39cc7e1..eaf4ff0 100755 (executable)
--- a/source/mircoders/module/ModuleUsers.java
+++ b/source/mircoders/module/ModuleUsers.java
@@ -60,7 +60,7 @@ public class ModuleUsers extends AbstractModule
     if (aStorage == null)
       logger.warn("ModuleUsers(): StorageObject was null!");
 
-    theStorage = aStorage;
+    storage = aStorage;
   }
 
   /**
@@ -70,7 +70,7 @@ public class ModuleUsers extends AbstractModule
    * @param password          The password
    * @return                  The authenticated user, or <code>null</code> if the user
    *                          doesn't exist, or the supplied password is invalid.
-   * @throws ModuleException
+   * @throws ModuleExc
    */
 
   public EntityUsers getUserForLogin(String user, String password) throws ModuleExc, ModuleFailure {
@@ -87,10 +87,9 @@ public class ModuleUsers extends AbstractModule
       if (userList != null && userList.getCount() == 1) {
         EntityUsers result = (EntityUsers) userList.elementAt(0);
 
-        if (result.getValue("is_disabled") == null ||
-            result.getValue("is_disabled").equals("0"))
+        if (result.getFieldValue("is_disabled") == null ||
+            result.getFieldValue("is_disabled").equals("0"))
             return result;
-
       }
 
       return null;
@@ -102,7 +101,7 @@ public class ModuleUsers extends AbstractModule
 
   public boolean checkUserPassword(EntityUsers aUser, String aPassword) throws ModuleExc, ModuleFailure {
     try {
-      return aUser.getValue("password").equals(MirGlobal.localizer().adminInterface().makePasswordDigest(aPassword));
+      return aUser.getFieldValue("password").equals(MirGlobal.localizer().adminInterface().makePasswordDigest(aPassword));
     }
     catch (Throwable t) {
       throw new ModuleFailure(t);
@@ -165,10 +164,12 @@ public class ModuleUsers extends AbstractModule
     try {
       String sql = "update webdb_users set lastlogin=now() where id = " + aUser.getId();
 
-      theStorage.executeUpdate(sql);
+      storage.executeUpdate(sql);
     }
     catch (Throwable t) {
-      throw new ModuleFailure(t);
+//      no propagation of this error for now, to allow mir to still function
+//      with older db schemas
+//      throw new ModuleFailure(t);
     }
   }
 }
\ No newline at end of file