##// END OF EJS Templates
Fixed middlewares
neko259 -
r2018:9b956998 default
parent child Browse files
Show More
@@ -2,6 +2,7 b' import pytz'
2
2
3 from django.shortcuts import redirect
3 from django.shortcuts import redirect
4 from django.utils import timezone
4 from django.utils import timezone
5 from django.utils.deprecation import MiddlewareMixin
5
6
6 from boards import utils
7 from boards import utils
7 from boards.models import Ban
8 from boards.models import Ban
@@ -15,18 +16,12 b" RESPONSE_CONTENT_TYPE = 'Content-Type'"
15 TYPE_HTML = 'text/html'
16 TYPE_HTML = 'text/html'
16
17
17
18
18 class BanMiddleware:
19 class BanMiddleware(MiddlewareMixin):
19 """
20 """
20 This is run before showing the thread. Banned users don't need to see
21 This is run before showing the thread. Banned users don't need to see
21 anything
22 anything
22 """
23 """
23
24 def process_request(self, request):
24 def __init__(self, get_response):
25 self.get_response = get_response
26
27 def __call__(self, request):
28 response = self.get_response(request)
29
30 if request.path != PATH_BANNED:
25 if request.path != PATH_BANNED:
31 ip = utils.get_client_ip(request)
26 ip = utils.get_client_ip(request)
32 try:
27 try:
@@ -37,21 +32,11 b' class BanMiddleware:'
37 except Ban.DoesNotExist:
32 except Ban.DoesNotExist:
38 pass
33 pass
39
34
40 return response
41
35
42
36 class TimezoneMiddleware(MiddlewareMixin):
43 class TimezoneMiddleware(object):
37 def process_request(self, request):
44 def __init__(self, get_response):
45 self.get_response = get_response
46
47 def __call__(self, request):
48 response = self.get_response(request)
49
50 tzname = request.session.get(SESSION_TIMEZONE)
38 tzname = request.session.get(SESSION_TIMEZONE)
51 if tzname:
39 if tzname:
52 timezone.activate(pytz.timezone(tzname))
40 timezone.activate(pytz.timezone(tzname))
53 else:
41 else:
54 timezone.deactivate()
42 timezone.deactivate()
55
56 return response
57
General Comments 0
You need to be logged in to leave comments. Login now