Merge remote-tracking branch 'origin/better-emails'

data/model/legacy.py

@@ -497,18 +497,20 @@ def confirm_user_email(code):
   user = code.user
   user.verified = True
 
+  old_email = None
   new_email = code.new_email
   if new_email:
     if find_user_by_email(new_email):
       raise DataModelException('E-mail address already used.')    
       
+    old_email = user.email
     user.email = new_email
   
   user.save()
 
   code.delete_instance()
 
-  return user, new_email
+  return user, new_email, old_email
 
 
 def create_reset_password_email_code(email):
@@ -551,6 +553,13 @@ def get_user(username):
     return None
 
 
+def get_user_or_org(username):
+  try:
+    return User.get(User.username == username, User.robot == False)
+  except User.DoesNotExist:
+    return None
+
+
 def get_user_or_org_by_customer_id(customer_id):
   try:
     return User.get(User.stripe_id == customer_id)