# Registration
- def register(self, uid, email, first_name, last_name):
+ def register(self, uid, email, first_name, last_name, country_code=None):
# Convert all uids to lowercase
uid = uid.lower()
# Create an entry in our database until the user
# has activated the account
self.db.execute("INSERT INTO account_activations(uid, activation_code, \
- email, first_name, last_name) VALUES(%s, %s, %s, %s, %s)",
- uid, activation_code, email, first_name, last_name)
+ email, first_name, last_name, country_code) VALUES(%s, %s, %s, %s, %s, %s)",
+ uid, activation_code, email, first_name, last_name, country_code)
# Send an account activation email
self.backend.messages.send_template("auth/messages/register",
# Create a new account on the LDAP database
account = self.create(uid, res.email,
- first_name=res.first_name, last_name=res.last_name)
+ first_name=res.first_name, last_name=res.last_name,
+ country_code=res.country_code)
# Send email about account registration
self.backend.messages.send_template("people/messages/new-account",
return account
- def create(self, uid, email, first_name, last_name):
+ def create(self, uid, email, first_name, last_name, country_code=None):
cn = "%s %s" % (first_name, last_name)
# Account Parameters
self.accounts._authenticate()
self.ldap.add_s(dn, ldap.modlist.addModlist(account))
+ # Fetch the account
+ account = self.get_by_dn(dn)
+
+ # Optionally set country code
+ if country_code:
+ account.country_code = country_code
+
# Return account
- return self.get_by_dn(dn)
+ return account
# Session stuff