diff options
Diffstat (limited to 'forum_modules/localauth')
| -rwxr-xr-x | forum_modules/localauth/templates/loginform.html | 2 | ||||
| -rwxr-xr-x | forum_modules/localauth/views.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/forum_modules/localauth/templates/loginform.html b/forum_modules/localauth/templates/loginform.html index 0d95a2f2..b1784fb6 100755 --- a/forum_modules/localauth/templates/loginform.html +++ b/forum_modules/localauth/templates/loginform.html @@ -24,7 +24,7 @@ <input id="blogin" name="blogin" type="submit" value="Login" />
</td>
<td>
- <a href="{% url auth_local_register %}">Create account</a><span> | </span><a href="{% url auth_local_register %}">Forgot your password?</a>
+ <a href="{% url auth_local_register %}">Create account</a><span> | </span><a href="{% url auth_request_tempsignin %}">Forgot your password?</a>
</td>
</tr>
</table>
diff --git a/forum_modules/localauth/views.py b/forum_modules/localauth/views.py index 1d1e0b3d..db71e902 100755 --- a/forum_modules/localauth/views.py +++ b/forum_modules/localauth/views.py @@ -1,10 +1,11 @@ from django.contrib.auth.models import User from django.shortcuts import render_to_response from django.template import RequestContext +from django.utils.translation import ugettext as _ from forms import ClassicRegisterForm from forum.authentication.forms import SimpleEmailSubscribeForm -from forum.views.auth import login_and_forward +from forum.views.auth import login_and_forward, send_validation_email def register(request): if request.method == 'POST': @@ -17,9 +18,9 @@ def register(request): email = form.cleaned_data['email'] user_ = User.objects.create_user( username,email,password ) + send_validation_email(user_) email_feeds_form.save(user_) - #todo: email validation - return login_and_forward(request, user_) + return login_and_forward(request, user_, None, _("A validation email has been sent to your email address. ")) else: form = ClassicRegisterForm(initial={'next':'/'}) email_feeds_form = SimpleEmailSubscribeForm() |