small fixes yet again

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

diff --git a/source/mircoders/module/ModuleUsers.java b/source/mircoders/module/ModuleUsers.java
index 779dc2c..2003151 100755 (executable)
--- a/source/mircoders/module/ModuleUsers.java
+++ b/source/mircoders/module/ModuleUsers.java
@@ -1,9 +1,41 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mircoders.module;
 
 import java.io.*;
 import java.lang.*;
 import java.util.*;
 import java.sql.*;
+
 import javax.servlet.*;
 import javax.servlet.http.*;
 
@@ -14,6 +46,7 @@ import mir.module.*;
 import mir.entity.*;
 import mir.misc.*;
 import mir.storage.*;
+import mir.log.*;
 
 import mircoders.entity.*;
 import mircoders.storage.*;
@@ -28,48 +61,46 @@ import mircoders.storage.*;
 
 public class ModuleUsers extends AbstractModule
 {
-       static Logfile theLog;
-
-       // Kontruktor
-
-       public ModuleUsers(StorageObject theStorage)
-       {
-
-               if (theLog == null) theLog = Logfile.getInstance(this.getClass().getName());
-               if (theStorage == null) theLog.printWarning("StorageObject was null!");
-               this.theStorage = theStorage;
-
-       }
-
-       /**
-        * login method
-        */
-
-       public EntityUsers getUserForLogin(String user, String password) throws ModuleException
-       {
-               String whereString = "login='" +user + "' and password='"+ password + "' and is_admin='1'";
-               EntityList userList = getByWhereClause(whereString, -1);
-               if (userList != null && userList.getCount()==1)
-                       return (EntityUsers)userList.elementAt(0);
-               else return null;
-       }
-
-
-
-       public EntityList getUsers(String whereClause, int offset, int limit)
-               throws ModuleException
-       {
-               try {
-                       return theStorage.selectByWhereClause(whereClause, null, offset, limit);
-               }
-               catch (StorageObjectException e){
-                       throw new ModuleException(e.toString());
-               }
-       }
-
-       public SimpleList getUsersAsSimpleList() {
-               //  String sql = "select id, name from Users order by name";
-               return ((DatabaseUsers)theStorage).getPopupData();
-       }
-
-}
+  static LoggerWrapper logger = new LoggerWrapper("Module.Users");
+
+  public ModuleUsers(StorageObject theStorage)
+  {
+    if (theStorage == null)
+      logger.warn("StorageObject was null!");
+
+    this.theStorage = theStorage;
+  }
+
+  /**
+   * login method
+   */
+
+  public EntityUsers getUserForLogin(String user, String password) throws ModuleException
+  {
+    String whereString = "login='" +user + "' and password='"+ password + "' and is_admin='1'";
+    EntityList userList = getByWhereClause(whereString, -1);
+    if (userList != null && userList.getCount()==1)
+      return (EntityUsers)userList.elementAt(0);
+    else
+      return null;
+  }
+
+  public EntityList getUsers(String whereClause, int offset, int limit) throws ModuleException
+  {
+    try {
+      return theStorage.selectByWhereClause(whereClause, null, offset, limit);
+    }
+    catch (StorageObjectException e){
+      throw new ModuleException(e.toString());
+    }
+  }
+
+  public SimpleList getUsersAsSimpleList() throws ModuleException {
+    try {
+      return ((DatabaseUsers)theStorage).getPopupData();
+    }
+    catch(StorageObjectException e) {
+      throw new ModuleException(e.toString());
+    }
+  }
+}
\ No newline at end of file