whoops...

[mir.git] / source / Mir.java

diff --git a/source/Mir.java b/source/Mir.java
index b42796d..6f75be3 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -56,6 +56,7 @@ public class Mir extends AbstractServlet {
 
         long startTime = System.currentTimeMillis();
         long sessionConnectTime = 0;
+        EntityUsers userEntity;
         String http = "";
 
         // get the configration - this could conflict if 2 mirs are in the
@@ -66,6 +67,7 @@ public class Mir extends AbstractServlet {
         MirConfig.setServletName(getServletName());
 
         session = req.getSession(true);
+        userEntity = (EntityUsers) session.getAttribute("login.uid");
 
         if (req.getServerPort() == 443) http = "https"; else http = "http";
         res.setContentType("text/html");
@@ -81,18 +83,18 @@ public class Mir extends AbstractServlet {
         }
 
         // Authentifizierung
-        if (moduleName != null && moduleName.equals("login")) {
+        if ((moduleName != null && moduleName.equals("login")) || (userEntity==null)) {
             String user = req.getParameter("login");
             String passwd = req.getParameter("password");
             theLog.printDebugInfo("--login: evaluating for user: " + user);
-            EntityUsers userEntity = allowedUser(user, passwd);
+            userEntity = allowedUser(user, passwd);
             if (userEntity == null) {
                 // login failed: redirecting to login
                 theLog.printWarning("--login: failed!");
                 _sendLoginPage(res, req, res.getWriter());
                 return;
             }
-            else {
+            else if (moduleName!=null && moduleName.equals("login")) {
                 // login successful
 
                 theLog.printInfo("--login: successful! setting uid: " + userEntity.getId());
@@ -145,7 +147,6 @@ public class Mir extends AbstractServlet {
         }
 
         // Check if authed!
-        EntityUsers userEntity = (EntityUsers) session.getAttribute("login.uid");
         if (userEntity == null) {
             // redirect to loginpage
             String redirectString = req.getRequestURI();