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