Upstream changes

3 files changed, 32 insertions, 11 deletions

diff --git a/Mailman/Gui/Digest.py b/Mailman/Gui/Digest.py
index f7722019..77691aee 100644
--- a/Mailman/Gui/Digest.py
+++ b/Mailman/Gui/Digest.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -56,8 +56,8 @@ class Digest(GUIBase):
 	     _('When receiving digests, which format is default?')),
 
 	    ('digest_size_threshhold', mm_cfg.Number, 3, 0,
-	     _('How big in Kb should a digest be before it gets sent out?')),
-            # Should offer a 'set to 0' for no size threshhold.
+	     _('How big in Kb should a digest be before it gets sent out?'
+               '  0 implies no maximum size.')),
 
  	    ('digest_send_periodic', mm_cfg.Radio, (_('No'), _('Yes')), 1,
 	     _('Should a digest be dispatched daily when the size threshold '
diff --git a/Mailman/Gui/GUIBase.py b/Mailman/Gui/GUIBase.py
index a365acaf..9a8b68fb 100644
--- a/Mailman/Gui/GUIBase.py
+++ b/Mailman/Gui/GUIBase.py
@@ -63,6 +63,7 @@ class GUIBase:
             if isinstance(val, ListType):
                 return val
             addrs = []
+            bad_addrs = []
             for addr in [s.strip() for s in val.split(NL)]:
                 # Discard empty lines
                 if not addr:
@@ -77,22 +78,24 @@ class GUIBase:
                         try:
                             re.compile(addr)
                         except re.error:
-                            raise ValueError
+                            bad_addrs.append(addr)
                     elif (wtype == mm_cfg.EmailListEx and addr.startswith('@')
                             and property.endswith('_these_nonmembers')):
                         # XXX Needs to be reviewed for list@domain names.
                         # don't reference your own list
                         if addr[1:] == mlist.internal_name():
-                            raise ValueError
+                            bad_addrs.append(addr)
                         # check for existence of list?  For now allow
                         # reference to list before creating it.
                     else:
-                        raise
+                        bad_addrs.append(addr)
                 if property in ('regular_exclude_lists',
                                 'regular_include_lists'):
                     if addr.lower() == mlist.GetListEmail().lower():
-                        raise Errors.EmailAddressError
+                        bad_addrs.append(addr)
                 addrs.append(addr)
+            if bad_addrs:
+                raise Errors.EmailAddressError, ', '.join(bad_addrs)
             return addrs
         # This is a host name, i.e. verbatim
         if wtype == mm_cfg.Host:
@@ -168,9 +171,9 @@ class GUIBase:
             except ValueError:
                 doc.addError(_('Invalid value for variable: %(property)s'))
             # This is the parent of MMBadEmailError and MMHostileAddress
-            except Errors.EmailAddressError:
+            except Errors.EmailAddressError, error:
                 doc.addError(
-                    _('Bad email address for option %(property)s: %(val)s'))
+                    _('Bad email address for option %(property)s: %(error)s'))
             else:
                 # Set the attribute, which will normally delegate to the mlist
                 self._setValue(mlist, property, val, doc)
diff --git a/Mailman/Gui/General.py b/Mailman/Gui/General.py
index e9f8f9b5..24bc009a 100644
--- a/Mailman/Gui/General.py
+++ b/Mailman/Gui/General.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -153,7 +153,25 @@ class General(GUIBase):
              directive. eg.; [listname %%d] -> [listname 123]
                             (listname %%05d) -> (listname 00123)
              """)),
+          ]
 
+        if mm_cfg.ALLOW_FROM_IS_LIST:
+            rtn.append(
+                ('from_is_list', mm_cfg.Radio,
+                 (_('No'), _('Mung From'), _('Wrap Message')), 0,
+                 _("""Replace the sender with the list address to conform with
+                 policies like ADSP and DMARC.  It replaces the poster's
+                 address in the From: header with the list address and adds the
+                 poster to the Reply-To: header, but the anonymous_list and
+                 Reply-To: header munging settings below take priority.  If
+                 setting this to Yes, it is advised to set the MTA to DKIM sign
+                 all emails.""") +
+                 _("""<br>If this is set to Wrap Message, just wrap the message
+                 in an outer message From: the list with Content-Type:
+                 message/rfc822."""))
+              )
+
+        rtn.extend([
             ('anonymous_list', mm_cfg.Radio, (_('No'), _('Yes')), 0,
              _("""Hide the sender of a message, replacing it with the list
              address (Removes From, Sender and Reply-To fields)""")),
@@ -374,7 +392,7 @@ class General(GUIBase):
              useful for selecting among alternative names of a host that has
              multiple addresses.""")),
 
-          ]
+          ])
 
         if mm_cfg.ALLOW_RFC2369_OVERRIDES:
             rtn.append(