Use new Log class everywhere

[cascardo/ipsilon.git] / ipsilon / util / user.py

diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 72c5041..84f1818 100755 (executable)
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ipsilon.util.data import Store
+from ipsilon.util.log import Log
 import cherrypy
 
 
@@ -76,6 +77,13 @@ class User(object):
     def fullname(self, value):
         self._userdata['fullname'] = value
 
+    @property
+    def email(self):
+        if 'email' in self._userdata:
+            return self._userdata['email']
+        else:
+            return None
+
     @property
     def sites(self):
         if 'sites' in self._userdata:
@@ -87,24 +95,22 @@ class User(object):
 
     @sites.setter
     def sites(self):
-        #TODO: implement setting sites via the user object ?
+        # TODO: implement setting sites via the user object ?
         raise AttributeError
 
 
-class UserSession(object):
+class UserSession(Log):
     def __init__(self):
         self.user = self.get_data('user', 'name')
 
-    def _debug(self, fact):
-        if cherrypy.config.get('debug', False):
-            cherrypy.log(fact)
-
     def get_user(self):
         return User(self.user)
 
     def remote_login(self):
         if cherrypy.request.login:
-            return self.login(cherrypy.request.login)
+            self.login(cherrypy.request.login)
+        else:
+            self.nuke_data('user')
 
     def login(self, username):
         if self.user == username:
@@ -113,8 +119,9 @@ class UserSession(object):
         # REMOTE_USER changed, replace user
         self.nuke_data('user')
         self.save_data('user', 'name', username)
+        self.user = username
 
-        cherrypy.log('LOGIN SUCCESSFUL: %s', username)
+        cherrypy.log('LOGIN SUCCESSFUL: %s' % username)
 
     def logout(self, user):
         if user is not None: