@@ -33,30 +33,29 @@ def register(request):
3333 if request .method == 'POST' :
3434 # Attempt to grab information from the raw form information.
3535 # Note that we make use of both UserForm and UserProfileForm.
36- user_form = UserForm (data = request .POST )
36+ data = request .POST .copy ()
37+ data ["username" ] = data ["email" ]
38+ user_form = UserForm (data = data )
3739
3840 # If the two forms are valid...
3941 if user_form .is_valid ():
40- if '@' in request .POST ['username' ]:
41- user_form = UserForm ()
42- else :
4342 # Save the user's form data to the database.
44- user = user_form .save ()
45-
46- # Hash the password with the set_password method
47- user .set_password (user .password )
48- user .is_active = False
49- user .save ()
50- profile = UserProfile (user = user , displayPref = 1 , time_creation = timezone .now ())
51- profile .save ()
52- # Update our variable to tell the template registration was successful.
53- registered = True
54-
55- htmlstr = "<p><a href='https://opra.cs.rpi.edu/auth/register/confirm/" + opra_crypto .encrypt (user .id )+ "'>Click This Link To Activate Your Account</a></p>"
56- mail .send_mail ("OPRA Confirmation" ,"Please confirm your account registration." ,'oprahprogramtest@gmail.com' ,[user .email ],html_message = htmlstr )
43+ user = user_form .save ()
44+
45+ # Hash the password with the set_password method
46+ user .set_password (user .password )
47+ user .is_active = False
48+ user .save ()
49+ profile = UserProfile (user = user , displayPref = 1 , time_creation = timezone .now ())
50+ profile .save ()
51+ # Update our variable to tell the template registration was successful.
52+ registered = True
53+
54+ htmlstr = "<p><a href='https://opra.cs.rpi.edu/auth/register/confirm/" + opra_crypto .encrypt (user .id )+ "'>Click This Link To Activate Your Account</a></p>"
55+ mail .send_mail ("OPRA Confirmation" ,"Please confirm your account registration." ,'oprahprogramtest@gmail.com' ,[user .email ],html_message = htmlstr )
5756 #else print (user_form.errors)
5857 else :
59- return HttpResponse ("This user name already exists. Please try a different one. <a href='/auth/register'>Return to registration</a>" )
58+ return HttpResponse ("This email already exists. Please try a different one. <a href='/auth/register'>Return to registration</a>" )
6059# Not a HTTP POST, so we render our form using two ModelForm instances.
6160# These forms will be blank, ready for user input.
6261 else :
@@ -82,28 +81,27 @@ def quickRegister(request, question_id):
8281
8382 registered = False
8483 if request .method == 'POST' :
85- user_form = UserForm (data = request .POST )
84+ data = request .POST .copy ()
85+ data ["username" ] = data ["email" ]
86+ user_form = UserForm (data = data )
8687 if user_form .is_valid ():
87- if '@' in request .POST ['username' ]:
88- user_form = UserForm ()
89- else :
90- # Save the user's form data to the database.
91- user = user_form .save ()
92-
93- # Hash the password with the set_password method
94- user .set_password (user .password )
95- user .is_active = False
96- user .save ()
97- profile = UserProfile (user = user , displayPref = 1 ,time_creation = timezone .now ())
98- profile .save ()
99- # Update our variable to tell the template registration was successful.
100- registered = True
101-
102- htmlstr = "<p><a href='https://opra.cs.rpi.edu/auth/" + str (question_id )+ "/quickconfirm/" + opra_crypto .encrypt (user .id )+ "'>Click This Link To Activate Your Account</a></p>"
103- mail .send_mail ("OPRA Confirmation" ,"Please confirm your account registration." ,'oprahprogramtest@gmail.com' ,[user .email ],html_message = htmlstr )
88+ # Save the user's form data to the database.
89+ user = user_form .save ()
90+
91+ # Hash the password with the set_password method
92+ user .set_password (user .password )
93+ user .is_active = False
94+ user .save ()
95+ profile = UserProfile (user = user , displayPref = 1 ,time_creation = timezone .now ())
96+ profile .save ()
97+ # Update our variable to tell the template registration was successful.
98+ registered = True
99+
100+ htmlstr = "<p><a href='https://opra.cs.rpi.edu/auth/" + str (question_id )+ "/quickconfirm/" + opra_crypto .encrypt (user .id )+ "'>Click This Link To Activate Your Account</a></p>"
101+ mail .send_mail ("OPRA Confirmation" ,"Please confirm your account registration." ,'oprahprogramtest@gmail.com' ,[user .email ],html_message = htmlstr )
104102 #else print (user_form.errors)
105103 else :
106- return HttpResponse ("This user name already exists. Please try a different one. <a href='/polls/" + str (question_id )+ "'>Return to registration</a>" )
104+ return HttpResponse ("This email already exists. Please try a different one. <a href='/polls/" + str (question_id )+ "'>Return to registration</a>" )
107105 return render (request ,
108106 'register.html' ,
109107 {'user_form' : user_form , 'registered' : registered })
@@ -128,7 +126,7 @@ def quickLogin(request, key, question_id):
128126def user_login (request ):
129127 context = RequestContext (request )
130128 if request .method == 'POST' :
131- username = request .POST ['username ' ]
129+ username = request .POST ['email ' ]
132130 password = request .POST ['password' ]
133131
134132 # Check if the username/password combination is valid - a User object is returned if it is.
@@ -172,21 +170,15 @@ def updateSettings(request):
172170 context = RequestContext (request )
173171
174172 if request .method == 'POST' :
175- updatedEmail = request .POST ['email' ]
173+ # updatedEmail = request.POST['email']
176174 first_name = request .POST ['first_name' ]
177175 last_name = request .POST ['last_name' ]
178176 if (first_name == "" and last_name != "" ) or (first_name != "" and last_name == "" ):
179177 return HttpResponse ("Please enter both a first and last name" )
180178
181- try :
182- validate_email (updatedEmail )
183- except ValidationError as e :
184- return HttpResponse ("Invalid email" )
185- else :
186- request .user .first_name = first_name
187- request .user .last_name = last_name
188- request .user .email = updatedEmail
189- request .user .save ()
179+ request .user .first_name = first_name
180+ request .user .last_name = last_name
181+ request .user .save ()
190182
191183 return HttpResponseRedirect (reverse ('appauth:settings' ))
192184
@@ -245,7 +237,7 @@ def resetPage(request, key):
245237
246238def forgetPassword (request ):
247239 email = request .POST ['email' ]
248- username = request . POST [ 'username' ]
240+ username = email
249241 if email == "" or username == "" :
250242 return HttpResponseRedirect (request .META .get ('HTTP_REFERER' ))
251243 user = get_object_or_404 (User , email = email , username = username )
0 commit comments