diff rhodecode/model/user.py @ 1618:9353189b7675 beta

Added automatic logout of deactivated/deleted users
author Liad Shani <liadff@gmail.com>
date Thu, 27 Oct 2011 20:40:49 +0200
parents 9dae92a65e40
children cbc2b1913cdf
line wrap: on
line diff
--- a/rhodecode/model/user.py	Wed Oct 26 21:59:22 2011 +0200
+++ b/rhodecode/model/user.py	Thu Oct 27 20:40:49 2011 +0200
@@ -243,16 +243,19 @@
             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):
         """