From 437e19bde3fe5e6fdccb0ec79ba0726190f4fd19 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Thu, 3 Dec 2009 17:05:21 -0800
Subject: Decoded RFC 2047 encoded message subjects for a few reports.  Bug
 #266428.

---
 Mailman/Cgi/confirm.py       | 7 ++++---
 Mailman/Handlers/Scrubber.py | 1 +
 Mailman/ListAdmin.py         | 4 +++-
 NEWS                         | 3 +++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py
index d0f5dea1..214d1b3f 100644
--- a/Mailman/Cgi/confirm.py
+++ b/Mailman/Cgi/confirm.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2009 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
@@ -634,8 +634,9 @@ def heldmsg_confirm(mlist, doc, cookie):
             # the user who posted the message.
             op, id = mlist.pend_confirm(cookie)
             ign, sender, msgsubject, ign, ign, ign = mlist.GetRecord(id)
-            subject = Utils.websafe(msgsubject)
             lang = mlist.getMemberLanguage(sender)
+            subject = Utils.websafe(Utils.oneline(msgsubject,
+                                                  Utils.GetCharSet(lang)))
             i18n.set_language(lang)
             doc.set_language(lang)
             # Discard the message
@@ -700,7 +701,7 @@ def heldmsg_prompt(mlist, doc, cookie, id):
     i18n.set_language(lang)
     doc.set_language(lang)
 
-    subject = Utils.websafe(msgsubject)
+    subject = Utils.websafe(Utils.oneline(msgsubject, Utils.GetCharSet(lang)))
     reason = Utils.websafe(_(givenreason))
     listname = mlist.real_name
     table.AddRow([_('''Your confirmation is required in order to cancel the
diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py
index b39f36d2..7c0519eb 100644
--- a/Mailman/Handlers/Scrubber.py
+++ b/Mailman/Handlers/Scrubber.py
@@ -266,6 +266,7 @@ URL: %(url)s
             finally:
                 os.umask(omask)
             subject = submsg.get('subject', _('no subject'))
+            subject = Utils.oneline(subject, lcset)
             date = submsg.get('date', _('no date'))
             who = submsg.get('from', _('unknown sender'))
             size = len(str(submsg))
diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py
index d91ab618..a290a358 100644
--- a/Mailman/ListAdmin.py
+++ b/Mailman/ListAdmin.py
@@ -292,9 +292,11 @@ class ListAdmin:
         elif value == mm_cfg.REJECT:
             # Rejected
             rejection = 'Refused'
+            lang = self.getMemberLanguage(sender)
+            subject = Utils.oneline(subject, Utils.GetCharSet(lang))
             self.__refuse(_('Posting of your message titled "%(subject)s"'),
                           sender, comment or _('[No reason given]'),
-                          lang=self.getMemberLanguage(sender))
+                          lang=lang)
         else:
             assert value == mm_cfg.DISCARD
             # Discarded
diff --git a/NEWS b/NEWS
index 5310f80a..5be550b8 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ Here is a history of user visible changes to Mailman.
 
   Bug Fixes and other patches
 
+    - Decoded RFC 2047 encoded message subjects for a few reports.
+      Bug #266428.
+
     - Fixed the French, Spanish and Hebrew translations which improperly
       translated the 'coding:' line in bin/config_list output.
 
-- 
cgit v1.2.3