Added automatic logout of deactivated/deleted users

--HG--
branch : beta

1 files changed, 5 insertions, 2 deletions

diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index 0c89a92d..60b45137 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -243,16 +243,19 @@ class UserModel(BaseModel):
             else:
                 dbuser = self.get(user_id)
 
-            if dbuser is not None:
+            if dbuser is not None and dbuser.active:
                 log.debug('filling %s data', dbuser)
                 for k, v in dbuser.get_dict().items():
                     setattr(auth_user, k, v)
+            else:
+                return False
 
         except:
             log.error(traceback.format_exc())
             auth_user.is_authenticated = False
+            return False
 
-        return auth_user
+        return True
 
     def fill_perms(self, user):
         """