X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/490b45cdc311a09db0266a3f974289e3979bf2ea..453a7ca3b9d5e7093f843b883db58f9beb1b3aa8:/floof/controllers/account.py?ds=sidebyside

diff --git a/floof/controllers/account.py b/floof/controllers/account.py
index 2073d44..0b58078 100644
--- 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__)
 
+from floof.model import UserPage
+
 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()
+        h.flash(u'You are now logged in.')
 
         # 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()
 
+        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))
+
         elixir.session.commit()
 
         # Log in