| @@ -1,6 +1,6 @@ | |||||
| from models.database import db | from models.database import db | ||||
| def set_user(username, password, full_name, company, email, phone_number, | |||||
| def set_user(username, password, full_name, company, email, | |||||
| street_address, city, state, postal_code, country): | street_address, city, state, postal_code, country): | ||||
| """ | """ | ||||
| Register a new user in the database | Register a new user in the database | ||||
| @@ -26,10 +26,7 @@ register_form = form.Form( | |||||
| form.Textbox("postal_code", num, description="Postal code"), | form.Textbox("postal_code", num, description="Postal code"), | ||||
| form.Textbox("country", description="Country"), | form.Textbox("country", description="Country"), | ||||
| form.Password("password", vpass, description="Password"), | form.Password("password", vpass, description="Password"), | ||||
| form.Button("Register", type="submit", description="Register"), | |||||
| validators = [ | |||||
| form.Validator("User already exists", lambda i: models.login.get_user_id_by_name(i.username) == None) | |||||
| ] | |||||
| form.Button("Register", type="submit", description="Register") | |||||
| ) | ) | ||||
| def get_task_form_elements(identifier=0, task_title="", task_description="", budget=""): | def get_task_form_elements(identifier=0, task_title="", task_description="", budget=""): | ||||
| @@ -36,10 +36,14 @@ class Register: | |||||
| if not r.validates(): | if not r.validates(): | ||||
| return render.register(nav, r, "All fields must be valid.") | return render.register(nav, r, "All fields must be valid.") | ||||
| models.register.set_user(data.username, hashlib.md5(b'TDT4237' + data.password.encode('utf-8')).hexdigest(), | |||||
| data.full_name, data.company, data.phone_number, data.street_address, | |||||
| data.city, data.state, data.postal_code, data.country) | |||||
| message += "User registered!" | |||||
| # Check if user exists | |||||
| if models.login.get_user_id_by_name(data.username): | |||||
| return render.register(nav, r, "Invalid user, already exists.") | |||||
| models.register.set_user(data.username, | |||||
| hashlib.md5(b'TDT4237' + data.password.encode('utf-8')).hexdigest(), | |||||
| data.full_name, data.company, data.email, data.street_address, | |||||
| data.city, data.state, data.postal_code, data.country) | |||||
| return render.register(nav, register_form, message) | |||||
| return render.register(nav, register_form, "User registered!") | |||||