From eba8a928ee0971c924c35136aa80abe4133fd944 Mon Sep 17 00:00:00 2001 From: glondu Date: Tue, 28 Feb 2006 23:39:18 +0100 Subject: [PATCH] On affiche dans le whos les redirections de mail. darcs-hash:20060228223918-68412-b2129e2af75493cb2ccaf939de30d33cd0f95623.gz --- gestion/whos.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/gestion/whos.py b/gestion/whos.py index 0b5923e4..4eb033d6 100755 --- a/gestion/whos.py +++ b/gestion/whos.py @@ -301,15 +301,27 @@ def adher_details(adher) : if adher.rewriteMailHeaders(): RMH = u' (%s)'%coul(u'réécriture en-têtes mail','gris') - alias = ', '.join([adher.cannonical_alias()] + adher.alias()) - if alias : - if alias[0]==',' : - # Cannonical étéait vide - alias = alias[2:] - f += coul(u'Alias : ','gras') + alias - f+= GL - f+= RMH - f+= u'\n' + alias = ', '.join([adher.cannonical_alias()] + adher.alias()) + if alias: + if alias[0] == ',': + # Cannonical étéait vide + alias = alias[2:] + f += coul(u'Alias : ','gras') + alias + f += GL + f += RMH + f += u'\n' + try: + forward = file("/home/%s/.forward" % adher.compte()).readlines() + if len(forward) > 1: + forward = forward[0].strip() + " ...\n" + elif len(forward) == 1: + forward = forward[0].strip() + "\n" + if forward: + f += coul(u'Redirection : ', 'gras') + forward + except IOError, e: + # Pas de .forward, ou .forward privé... on laisse tomber + pass + # Etat administratif f += coul(u'Etat administratif : ','gras')