return res
else:
return (None, None)
- return (email, mbox)
+ return (email.lower(), mbox)
##
# see /usr/lib/mailman/bin/rmlist
if email is None:
udesc = userdesc
else:
- udesc = UserDesc(email, email, None, 0)
+ udesc = UserDesc(email.lower(), email.lower(), None, 0)
prefix = vhost.lower()+VHOST_SEP
names = Utils.list_names()
names.sort()
return 0
mlist.Lock()
- mlist.ApprovedChangeMemberAddress(from_email, to_email, 0)
+ mlist.ApprovedChangeMemberAddress(from_email.lower(), to_email.lower(), 0)
mlist.Save()
mlist.Unlock()
return 1
return 0
if mlist.header_filter_rules == []:
return 0
- action = mlist.header_filter_rules[0][1]
- if action == mm_cfg.HOLD:
- return 1
- if action == mm_cfg.DISCARD:
+ try:
+ action = mlist.header_filter_rules[1][1]
return 2
+ except:
+ action = mlist.header_filter_rules[0][1]
+ if action == mm_cfg.HOLD:
+ return 1
+ if action == mm_cfg.DISCARD:
+ return 3
except:
return 0
if int(level) is 1:
hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.HOLD, False))
elif int(level) is 2:
+ hfr.append(('X-Spam-Flag: Yes, tests=bogofilter, spamicity=(0\.999999|1\.000000)', mm_cfg.DISCARD, False))
+ hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.HOLD, False))
+ elif int(level) is 3:
hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.DISCARD, False))
if mlist.header_filter_rules != hfr:
mlist.Lock()