From d919134329807a0cd28e743f369ddaefba17f2bf Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Mon, 10 Feb 2014 16:42:28 +0100 Subject: [PATCH] =?UTF-8?q?[wiki/action/crans=5Fnewaccount,wiki/creer=5Fco?= =?UTF-8?q?mpte=5Fwiki]=20Petites=20modifications=20pour=20pouvoir=20cr?= =?UTF-8?q?=C3=A9er=20des=20comptes=20depuis=20l'intranet2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wiki/action/crans_newaccount.py | 1 + wiki/creer_compte_wiki.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wiki/action/crans_newaccount.py b/wiki/action/crans_newaccount.py index d5664f49..284c2a8a 100644 --- a/wiki/action/crans_newaccount.py +++ b/wiki/action/crans_newaccount.py @@ -24,6 +24,7 @@ def do_register(request): authorized_ips = [ '2a01:240:fe3d:4:2248cff:fe44:3b70', #vo.v6 '2a01:240:fe3d:4:219:bbff:fe3c:4f76', #zamok.v6 + '2a01:240:fe3d:4:0:6cff:fe69:6921', #o2.v6 ] if request.remote_addr not in authorized_ips: diff --git a/wiki/creer_compte_wiki.py b/wiki/creer_compte_wiki.py index c68f53cc..55848d77 100755 --- a/wiki/creer_compte_wiki.py +++ b/wiki/creer_compte_wiki.py @@ -29,7 +29,7 @@ encoding = "utf-8" # Utilisateur qui lance le script user = getuser() -def send(msg): +def send(msg, user=user): msg['From'] = '%s@crans.org' % user msg['To'] = ','.join(bugmail) msg['User-Agent'] = 'creer_compte_wiki.py' @@ -38,7 +38,7 @@ def send(msg): smtp.sendmail('%s@crans.org' % user, bugmail, msg.as_string()) smtp.quit() -def creer_compte(nom, mdp, email): +def creer_compte(nom, mdp, email, user=user): form = {'action': 'crans_newaccount', 'name': nom.encode(encoding), 'password': mdp, @@ -55,7 +55,7 @@ def creer_compte(nom, mdp, email): if 'created' in data: msg = MIMEText(bugreport.encode(encoding) % form, 'plain', encoding) msg['Subject'] = "creer_compte_wiki.py: success" - send(msg) + send(msg, user) return u"Compte %s créé avec succès !" % nom, False elif 'nonunique name' in data: return u"Le compte %s existe déjà !" % nom, True @@ -82,7 +82,7 @@ correctement configur msg['Subject'] = '[Bugreport] creer_compte_wiki.py: creer_compte' msg.attach(txt) msg.attach(html) - send(msg) + send(msg, user) return coul(u"Erreur inconnue\n", "rouge") + \ u"Un rapport de bug a été automatiquement envoyé. Réessayez plus tard."