Revised subscription list presentation so it is on a separate page.

Also, changed text on submit buttons to distinguish what is being
submitted, ie subscribe vs visit subscibers list vs edit options.

Utilizing mm_utils.StampedLogger() on stderr so tracebacks are logged
to logs/error, for debugging.  (Better than sliced bread.)

1 files changed, 23 insertions, 7 deletions

diff --git a/cgi/listinfo b/cgi/listinfo
index 9c16496e0..e90bf00fe 100755
--- a/cgi/listinfo
+++ b/cgi/listinfo
@@ -1,11 +1,24 @@
 #!/usr/local/bin/python
-# We don't need to lock in this script, because we're never going to change data.
 
-import sys, os, string
-from regsub import gsub
+"""Produce listinfo page, primary web entry-point to maillists.
+
+Errors are redirected to logs/errors."""
+
+# No lock needed in this script, because we don't change data.
+
+import sys
 sys.path.append('/home/mailman/mailman/modules')
+
+import os, string
+from regsub import gsub
 import mm_utils, maillist, htmlformat
 
+try:
+    sys.stderr = mm_utils.StampedLogger("error", label = 'listinfo',
+                                        manual_reprime=1)
+except IOError:
+    pass                        # Oh well - SOL on redirect, errors show thru.
+
 doc = htmlformat.Document()
 
 path = os.environ['PATH_INFO']
@@ -43,13 +56,16 @@ else:
 replacements['<mm-plain-digests-button>'] = list.FormatPlainDigestsButton()
 replacements['<mm-mime-digests-button>'] = list.FormatMimeDigestsButton()
 replacements['<mm-subscribe-box>'] = list.FormatBox('email')
-replacements['<mm-subscribe-button>'] = list.FormatButton('email-button')
+replacements['<mm-subscribe-button>'] = list.FormatButton('email-button',
+                                                          text='Subscribe')
 replacements['<mm-new-password-box>'] = list.FormatSecureBox('pw')
 replacements['<mm-confirm-password>'] = list.FormatSecureBox('pw-conf')
 replacements['<mm-form-start>'] = list.FormatFormStart('subscribe')
-replacements['<mm-change-info>'] = htmlformat.TextBox('info', size=40).Format()
-replacements['<mm-info-button>'] = htmlformat.SubmitButton('submitinfo', 
-	                                                    'Submit').Format()
+replacements['<mm-editing-options>'] = list.FormatEditingOption()
+replacements['<mm-info-button>'] = \
+                         htmlformat.SubmitButton('UserOptions',
+                                                 'Edit Options').Format()
+replacements['<mm-roster-option>'] = list.FormatRosterOptionForUser()
 
 doc.AddItem(list.ParseTags('listinfo.html', replacements))
 print doc.Format()