From 1eb6e67ff1c662d9fbfd27fca578f764bb159fa5 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Sun, 16 Jun 2013 22:27:25 +0200 Subject: [PATCH] [wiki/auth] Pas d'inscription hors zone crans --- wiki/auth/ip_range.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/auth/ip_range.py b/wiki/auth/ip_range.py index 40473709..b6a3ba01 100644 --- a/wiki/auth/ip_range.py +++ b/wiki/auth/ip_range.py @@ -12,6 +12,7 @@ import urlparse from netaddr import IPNetwork, IPAddress from MoinMoin.auth import BaseAuth +from MoinMoin.Page import Page from MoinMoin import user from anonymous_user import AnonymousAuth @@ -35,7 +36,7 @@ class IpRange(AnonymousAuth): def request(self, request, user_obj, **kw): user_obj, cont = AnonymousAuth.request(self, request, user_obj, **kw) - if user_obj and not user_obj.valid: + if not user_obj or not user_obj.valid: # Are we trying to do a protected action (eg newaccount) action = request.args.get("action", "") if action in self.actions: @@ -44,8 +45,7 @@ class IpRange(AnonymousAuth): p = urlparse.urlparse(request.url) url = urlparse.urlunparse(('https', p.netloc, p.path, "", "", "")) request.http_redirect(url) - return user_obj, True - return user_obj, False + return user_obj, True