Cleaned up websetup a little.

[zzz-floof.git] / floof / controllers / account.py

diff --git a/floof/controllers/account.py b/floof/controllers/account.py
index 2073d44..0b58078 100644 (file)
--- a/floof/controllers/account.py
+++ b/floof/controllers/account.py
@@ -16,6 +16,8 @@ from floof.model.users import IdentityURL, User
 
 log = logging.getLogger(__name__)
 
 
 log = logging.getLogger(__name__)
 

+from floof.model import UserPage
+

 class AccountController(BaseController):
 
     openid_store = FileOpenIDStore('/var/tmp')
 class AccountController(BaseController):
 
     openid_store = FileOpenIDStore('/var/tmp')


@@ -77,6 +79,7 @@ class AccountController(BaseController):
         # Remember who's logged in, and we're good to go
         session['user_id'] = user.id
         session.save()
         # Remember who's logged in, and we're good to go
         session['user_id'] = user.id
         session.save()

+        h.flash(u'You are now logged in.')

 
         # XXX send me where I came from
         redirect('/')
 
         # XXX send me where I came from
         redirect('/')


@@ -119,9 +122,14 @@ class AccountController(BaseController):
             h.flash(u'This username is not valid.')
             return self.register()
 
             h.flash(u'This username is not valid.')
             return self.register()
 

+        if username in ['me']:
+            h.flash(u'This username is reserved.')
+            return self.register()
+

         # Create db records
         user = User(name=username, display_name=username)
         user.identity_urls.append(IdentityURL(url=identity_url))
         # Create db records
         user = User(name=username, display_name=username)
         user.identity_urls.append(IdentityURL(url=identity_url))

+

         elixir.session.commit()
 
         # Log in
         elixir.session.commit()
 
         # Log in