From a74d31de0ead8795344aa5c7be3af7eebd17755c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Wed, 31 Oct 2012 18:12:34 +0100 Subject: [PATCH] =?UTF-8?q?[Intranet]=20On=20d=C3=A9sactive=20le=20module?= =?UTF-8?q?=20quota.=20Ah,=20et=20on=20committe=20les=20trucs=20que=20les?= =?UTF-8?q?=20autres=20n'ont=20pas=20commit=C3=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ignore-this: 57875a22b7c26a01dcd51b9331c93997 darcs-hash:20121031171234-b6762-b3c312f180024717569702a58bd59ed8a3cc0a83.gz --- gestion/chgpass.py | 4 ++-- gestion/mail-all.py | 13 +++++++------ .../{modules => disabled.modules}/quota/main.py | 0 .../quota/static/icon.png | Bin .../quota/static/icon_alert.png | Bin .../quota/static/icon_digicode.png | Bin .../quota/templates/barre.svg.tmpl | 0 .../quota/templates/quota.tmpl | 0 .../quota/templates/quota_html.tmpl | 0 9 files changed, 9 insertions(+), 8 deletions(-) rename intranet/{modules => disabled.modules}/quota/main.py (100%) rename intranet/{modules => disabled.modules}/quota/static/icon.png (100%) rename intranet/{modules => disabled.modules}/quota/static/icon_alert.png (100%) rename intranet/{modules => disabled.modules}/quota/static/icon_digicode.png (100%) rename intranet/{modules => disabled.modules}/quota/templates/barre.svg.tmpl (100%) rename intranet/{modules => disabled.modules}/quota/templates/quota.tmpl (100%) rename intranet/{modules => disabled.modules}/quota/templates/quota_html.tmpl (100%) diff --git a/gestion/chgpass.py b/gestion/chgpass.py index d5096c23..17634735 100644 --- a/gestion/chgpass.py +++ b/gestion/chgpass.py @@ -168,9 +168,9 @@ if __name__ == '__main__' : cprint(u'Erreur lors de la recherche du login : plusieurs occurences !', 'rouge') sys.exit(4) - s = s.split('\n') + s = s.strip().split('\n') + dn = s[0].split()[1] try : - dn = s[0].split()[1] if len(s) == 2 : cprint(u"Changement du mot de passe du club %s "%decode64(' '.join(s[1].split()[1:])), 'vert') else : diff --git a/gestion/mail-all.py b/gestion/mail-all.py index 8e27448a..4f7308d2 100644 --- a/gestion/mail-all.py +++ b/gestion/mail-all.py @@ -48,12 +48,13 @@ par le script. cprint(u"%d adhérent(s) a/ont été trouvé(s)..." % len(adherents)) time.sleep(3) # On dort un peu, ctrl-c welcome - opt = commands.getoutput("/usr/sbin/postconf smtpd_client_message_rate_limit") - limit = int(opt.split()[-1]) - if limit > 0 and len(adherents) >= 10: - limit_risen = True - postconf(0) - else: limit_risen = False +# opt = commands.getoutput("/usr/sbin/postconf smtpd_client_message_rate_limit") +# limit = int(opt.split()[-1]) +# if limit > 0 and len(adherents) >= 10: +# limit_risen = True +# postconf(0) +# else: limit_risen = False + limit_risen = False try: try: diff --git a/intranet/modules/quota/main.py b/intranet/disabled.modules/quota/main.py similarity index 100% rename from intranet/modules/quota/main.py rename to intranet/disabled.modules/quota/main.py diff --git a/intranet/modules/quota/static/icon.png b/intranet/disabled.modules/quota/static/icon.png similarity index 100% rename from intranet/modules/quota/static/icon.png rename to intranet/disabled.modules/quota/static/icon.png diff --git a/intranet/modules/quota/static/icon_alert.png b/intranet/disabled.modules/quota/static/icon_alert.png similarity index 100% rename from intranet/modules/quota/static/icon_alert.png rename to intranet/disabled.modules/quota/static/icon_alert.png diff --git a/intranet/modules/quota/static/icon_digicode.png b/intranet/disabled.modules/quota/static/icon_digicode.png similarity index 100% rename from intranet/modules/quota/static/icon_digicode.png rename to intranet/disabled.modules/quota/static/icon_digicode.png diff --git a/intranet/modules/quota/templates/barre.svg.tmpl b/intranet/disabled.modules/quota/templates/barre.svg.tmpl similarity index 100% rename from intranet/modules/quota/templates/barre.svg.tmpl rename to intranet/disabled.modules/quota/templates/barre.svg.tmpl diff --git a/intranet/modules/quota/templates/quota.tmpl b/intranet/disabled.modules/quota/templates/quota.tmpl similarity index 100% rename from intranet/modules/quota/templates/quota.tmpl rename to intranet/disabled.modules/quota/templates/quota.tmpl diff --git a/intranet/modules/quota/templates/quota_html.tmpl b/intranet/disabled.modules/quota/templates/quota_html.tmpl similarity index 100% rename from intranet/modules/quota/templates/quota_html.tmpl rename to intranet/disabled.modules/quota/templates/quota_html.tmpl