Backporting from the trunk.

1 files changed, 27 insertions, 9 deletions

diff --git a/Mailman/Gui/NonDigest.py b/Mailman/Gui/NonDigest.py
index 900f865f..b66c5c4f 100644
--- a/Mailman/Gui/NonDigest.py
+++ b/Mailman/Gui/NonDigest.py
@@ -1,17 +1,17 @@
-# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2003 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
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """GUI component for managing the non-digest delivery options.
@@ -104,17 +104,35 @@ class NonDigest(GUIBase):
         # get a bogus warning if the header/footer contains a personalization
         # substitution variable, and we're transitioning from no
         # personalization to personalization enabled.
+        headfoot = Utils.maketext('headfoot.html', mlist=mlist, raw=1)
+        if mm_cfg.OWNERS_CAN_ENABLE_PERSONALIZATION:
+            extra = _("""\
+When <a href="?VARHELP=nondigest/personalize">personalization</a> is enabled
+for this list, additional substitution variables are allowed in your headers
+and footers:
+
+<ul><li><b>user_address</b> - The address of the user,
+        coerced to lower case.
+    <li><b>user_delivered_to</b> - The case-preserved address
+        that the user is subscribed with.
+    <li><b>user_password</b> - The user's password.
+    <li><b>user_name</b> - The user's full name.
+    <li><b>user_optionsurl</b> - The url to the user's option
+        page.
+</ul>
+""")
+        else:
+            extra = ''
+
         info.extend([('msg_header', mm_cfg.Text, (10, WIDTH), 0,
              _('Header added to mail sent to regular list members'),
              _('''Text prepended to the top of every immediately-delivery
-             message. ''') + Utils.maketext('headfoot.html',
-                                            mlist=mlist, raw=1)),
-            
+             message. ''') + headfoot + extra),
+
             ('msg_footer', mm_cfg.Text, (10, WIDTH), 0,
              _('Footer added to mail sent to regular list members'),
              _('''Text appended to the bottom of every immediately-delivery
-             message. ''') + Utils.maketext('headfoot.html',
-                                            mlist=mlist, raw=1)),
+             message. ''') + headfoot + extra),
             ])
         return info