From 662f43897a36654177b351ffa2075d6a8039dd5b Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Thu, 27 Oct 2016 15:37:37 -0700
Subject: Fixed incorrect "view more members" links at the bottom of the admin
Membership List pages.
---
Mailman/Cgi/admin.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'Mailman')
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index 843f6e08..736cc684 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -1188,11 +1188,12 @@ def membership_options(mlist, subcat, cgidata, doc, form):
continue
start = chunkmembers[i*chunksz]
end = chunkmembers[min((i+1)*chunksz, last)-1]
- url = url + 'chunk=%d' % i + findfrag
- if isinstance(url, unicode):
- url = url.encode(Utils.GetCharSet(mlist.preferred_language),
+ thisurl = url + 'chunk=%d' % i + findfrag
+ if isinstance(thisurl, unicode):
+ thisurl = thisurl.encode(
+ Utils.GetCharSet(mlist.preferred_language),
errors='ignore')
- link = Link(url, _('from %(start)s to %(end)s'))
+ link = Link(thisurl, _('from %(start)s to %(end)s'))
buttons.append(link)
buttons = UnorderedList(*buttons)
container.AddItem(footer + buttons.Format() + '<p>')
--
cgit v1.2.3
From 2354e5108bde36f90c6c8d8731b811d540bc3371 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Sat, 29 Oct 2016 10:05:15 -0700
Subject: Fixed a typo and deleted an unreferenced assignment.
---
Mailman/Utils.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'Mailman')
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index d2317b10..7bae2e6e 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1273,10 +1273,7 @@ def _DMARCProhibited(mlist, email, dmarc_domain, org=False):
email, dmarc_domain, e.__doc__)
return 'continue'
else:
-# people are already being dumb, don't trust them to provide honest DNS
-# where the answer section only contains what was asked for, nor to include
-# CNAMEs before the values they point to.
- full_record = ""
+ # Be as robust as possible in parsing the result.
results_by_name = {}
cnames = {}
want_names = set([dmarc_domain + '.'])
@@ -1316,7 +1313,7 @@ def _DMARCProhibited(mlist, email, dmarc_domain, org=False):
syslog('error',
"""RRset of TXT records for %s has %d v=DMARC1 entries;
testing them all""",
- dmarc_domain, len(dmarc))
+ dmarc_domain, len(dmarcs))
for entry in dmarcs:
mo = re.search(r'\bsp=(\w*)\b', entry, re.IGNORECASE)
if org and mo:
--
cgit v1.2.3