--- Mailman/Cgi/private.py.orig Sun Jun 13 04:10:10 1999 +++ Mailman/Cgi/private.py Sun Feb 20 23:31:04 2000 @@ -90,7 +90,7 @@ try: path = os.environ['PATH_INFO'] except KeyError: - doc.SetTitle("Private Archive Error") + doc.SetTitle("Archive Error") doc.AddItem(Header(3, "You must specify a list.")) print doc.Format(bgcolor="#FFFFFF") sys.exit(0) @@ -102,7 +102,7 @@ list_info = Utils.GetPathPieces(path) if len(list_info) < 1: - doc.SetTitle("Private Archive Error") + doc.SetTitle("Archive Error") doc.AddItem(Header(3, "You must specify a list.")) print doc.Format(bgcolor="#FFFFFF") sys.exit(0) @@ -124,7 +124,7 @@ listobj = None if not (listobj and listobj._ready): msg = "%s: No such list." % list_name - doc.SetTitle("Private Archive Error - %s" % msg) + doc.SetTitle("Archive Error - %s" % msg) doc.AddItem(Header(2, msg)) print doc.Format(bgcolor="#FFFFFF") sys.exit(0) @@ -140,24 +140,27 @@ if type(password) == type([]): password = password[0] password = password.value - is_auth = 0 - message = ("Please enter your %s subscription email address " - "and password." % listobj.real_name) - try: - is_auth = listobj.WebAuthenticate(user=user, - password=password, - cookie='archive') - except (Errors.MMBadUserError, Errors.MMBadPasswordError, - Errors.MMNotAMemberError): - message = ('Your email address or password were incorrect. ' - 'Please try again.') - except Errors.MMExpiredCookieError: - message = 'Your cookie has gone stale, ' \ - 'enter password to get a new one.', - except Errors.MMInvalidCookieError: - message = 'Error decoding authorization cookie.' - except Errors.MMAuthenticationError: - message = 'Authentication error.' + if listobj.archive_private: + is_auth = 0 + message = ("Please enter your %s subscription email address " + "and password." % listobj.real_name) + try: + is_auth = listobj.WebAuthenticate(user=user, + password=password, + cookie='archive') + except (Errors.MMBadUserError, Errors.MMBadPasswordError, + Errors.MMNotAMemberError): + message = ('Your email address or password were incorrect. ' + 'Please try again.') + except Errors.MMExpiredCookieError: + message = 'Your cookie has gone stale, ' \ + 'enter password to get a new one.', + except Errors.MMInvalidCookieError: + message = 'Error decoding authorization cookie.' + except Errors.MMAuthenticationError: + message = 'Authentication error.' + else: + is_auth = 1 if not is_auth: # Output the password form