Browse Source

Small cleaning of middlewares

Rafał Pitoń 11 years ago
parent
commit
5af056bc18
2 changed files with 5 additions and 14 deletions
  1. 3 14
      misago/acl/panels.py
  2. 2 0
      misago/users/middleware.py

+ 3 - 14
misago/acl/panels.py

@@ -3,11 +3,6 @@ from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 
 
-class MockUser(object):
-    def is_authenticated(self):
-        return False
-
-
 class MisagoACLPanel(Panel):
     """
     Panel that displays current user's ACL
@@ -25,18 +20,12 @@ class MisagoACLPanel(Panel):
             return _("Anonymous user")
 
     def process_response(self, request, response):
-        if hasattr(request, 'user'):
-            if  hasattr(request.user, 'acl'):
-                misago_user = request.user
-                misago_acl = request.user.acl
-            else:
-                misago_user = MockUser()
-                misago_acl = {}
+        if  hasattr(request.user, 'acl'):
+            misago_acl = request.user.acl
         else:
-            misago_user = MockUser()
             misago_acl = {}
 
         self.record_stats({
-            'misago_user': misago_user,
+            'misago_user': request.user,
             'misago_acl': misago_acl,
         })

+ 2 - 0
misago/users/middleware.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.contrib.auth import logout
+from django.contrib.auth.models import AnonymousUser as DjAnonymousUser
 from django.core.urlresolvers import resolve
 from django.utils import timezone
 
@@ -20,6 +21,7 @@ class RealIPMiddleware(object):
 class AvatarServerMiddleware(object):
     def process_request(self, request):
         if request.path.startswith(settings.MISAGO_AVATAR_SERVER_PATH):
+            request.user = DjAnonymousUser()
             resolved_path = resolve(request.path)
             return resolved_path.func(request, **resolved_path.kwargs)