Changeset 8386
- Timestamp:
- 08/15/08 12:42:13 (4 months ago)
- Files:
-
- django/trunk/django/contrib/auth/views.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/contrib/auth/views.py
r8383 r8386 3 3 from django.contrib.auth.decorators import login_required 4 4 from django.contrib.auth.forms import AuthenticationForm 5 from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm, PasswordChangeForm , AdminPasswordChangeForm5 from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm, PasswordChangeForm 6 6 from django.contrib.auth.tokens import default_token_generator 7 from django.core.exceptions import PermissionDenied8 7 from django.core.urlresolvers import reverse 9 8 from django.shortcuts import render_to_response, get_object_or_404 … … 12 11 from django.template import RequestContext 13 12 from django.utils.http import urlquote, base36_to_int 14 from django.utils.html import escape15 13 from django.utils.translation import ugettext as _ 16 14 from django.contrib.auth.models import User 17 15 from django.views.decorators.cache import never_cache 18 import re19 16 20 17 def login(request, template_name='registration/login.html', redirect_field_name=REDIRECT_FIELD_NAME): … … 26 23 # Light security check -- make sure redirect_to isn't garbage. 27 24 if not redirect_to or '//' in redirect_to or ' ' in redirect_to: 28 from django.conf import settings29 25 redirect_to = settings.LOGIN_REDIRECT_URL 30 26 from django.contrib.auth import login … … 60 56 "Logs out the user if he is logged in. Then redirects to the log-in page." 61 57 if not login_url: 62 from django.conf import settings63 58 login_url = settings.LOGIN_URL 64 59 return logout(request, login_url) … … 67 62 "Redirects the user to the login page, passing the given 'next' page" 68 63 if not login_url: 69 from django.conf import settings70 64 login_url = settings.LOGIN_URL 71 65 return HttpResponseRedirect('%s?%s=%s' % (login_url, urlquote(redirect_field_name), urlquote(next)))
