Ticket #8906: 8906_auth_script_prefix.diff

django/contrib/auth/views.py

@@ -4 +4 @@
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm, PasswordChangeForm
 from django.contrib.auth.tokens import default_token_generator
-from django.core.urlresolvers import reverse
+from django.core.urlresolvers import reverse, get_script_prefix
 from django.shortcuts import render_to_response, get_object_or_404
 from django.contrib.sites.models import Site, RequestSite
 from django.http import HttpResponseRedirect, Http404
@@ -22 +22 @@
         if form.is_valid():
             # Light security check -- make sure redirect_to isn't garbage.
             if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
-                redirect_to = settings.LOGIN_REDIRECT_URL
+                redirect_to = get_script_prefix() + settings.LOGIN_REDIRECT_URL
             from django.contrib.auth import login
             login(request, form.get_user())
             if request.session.test_cookie_worked():
@@ -55 +55 @@
 def logout_then_login(request, login_url=None):
     "Logs out the user if he is logged in. Then redirects to the log-in page."
     if not login_url:
-        login_url = settings.LOGIN_URL
+        login_url = get_script_prefix() + settings.LOGIN_URL
     return logout(request, login_url)
 
 def redirect_to_login(next, login_url=None, redirect_field_name=REDIRECT_FIELD_NAME):
     "Redirects the user to the login page, passing the given 'next' page"
     if not login_url:
-        login_url = settings.LOGIN_URL
+        login_url = get_script_prefix() + settings.LOGIN_URL
     return HttpResponseRedirect('%s?%s=%s' % (login_url, urlquote(redirect_field_name), urlquote(next)))
 
 # 4 views for password reset:
@@ -135 +135 @@
 
 def password_reset_complete(request, template_name='registration/password_reset_complete.html'):
     return render_to_response(template_name, context_instance=RequestContext(request,
-                                                                             {'login_url': settings.LOGIN_URL}))
+                                                                             {'login_url': get_script_prefix() + settings.LOGIN_URL}))
 
 def password_change(request, template_name='registration/password_change_form.html',
                     post_change_redirect=None):

django/contrib/auth/decorators.py

@@ -3 +3 @@
 except ImportError:
     from django.utils.functional import update_wrapper  # Python 2.3, 2.4 fallback.
 
+from django.core.urlresolvers import get_script_prefix
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.http import HttpResponseRedirect
 from django.utils.http import urlquote
@@ -51 +52 @@
     def __init__(self, view_func, test_func, login_url=None, redirect_field_name=REDIRECT_FIELD_NAME):
         if not login_url:
             from django.conf import settings
-            login_url = settings.LOGIN_URL
+            login_url = get_script_prefix() + settings.LOGIN_URL
         self.view_func = view_func
         self.test_func = test_func
         self.login_url = login_url