merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -25,6 +25,7 @@ Fixed:
 - fixed class "help" listing paging (sf bug 1106329)
 - nicer error looking up values of None (response to sf bug 1108697)
 - fallback for (list) popups if javascript disabled (sf patch 1101626)
+- ignore AutoReply messages (sf patch 1085051)
 
 
 2005-01-13 0.8.0b2

doc/index.txt

@@ -78,6 +78,7 @@ Wil Cooley,
 Joe Cooper,
 Kelley Dagley,
 Paul F. Dubois,
+Andrew Eland,
 Jeff Epler,
 Tom Epperly,
 Tamer Fahmy,

roundup/cgi/templating.py

@@ -640,10 +640,13 @@ def classhelp(self, properties=None, label=''"(list)", width='500',
             property = '&property=%s'%property
         if form:
             form = '&form=%s'%form
-        return '<a class="classhelp" href="javascript:help_window(\'%s?'\
-           '@startwith=0&amp;@template=help&amp;properties=%s%s%s\', \'%s\', \
-            \'%s\')">%s</a>'%(self.classname, properties, property, form, width,
-            height, self._(label))
+        help_url = "%s?@startwith=0&amp;@template=help&amp;"\
+                   "properties=%s%s%s" % \
+                   (self.classname, properties, property, form)
+        onclick = "javascript:help_window('%s', '%s', '%s');return false;" % \
+                  (help_url, width, height)
+        return '<a class="classhelp" href="%s" onclick="%s">%s</a>' % \
+               (help_url, onclick, self._(label))
 
     def submit(self, label=''"Submit New Entry"):
         ''' Generate a submit button (and action hidden element)

roundup/mailgw.py

@@ -72,7 +72,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 
-$Id: mailgw.py,v 1.159.2.2 2005-02-14 02:55:30 richard Exp $
+$Id: mailgw.py,v 1.159.2.3 2005-02-14 05:55:20 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -579,8 +579,9 @@ def handle_message(self, message):
         if message.getheader('x-roundup-loop', ''):
             raise IgnoreLoop
 
-        # detect Precedence: Bulk
-        if (message.getheader('precedence', '') == 'bulk'):
+        # detect Precedence: Bulk, or Microsoft Outlook autoreplies
+        if (message.getheader('precedence', '') == 'bulk'
+            or message.getheader('subject', '').lower().find("autoreply") > 0):
             raise IgnoreBulk
 
         # config is used many times in this method.

test/test_mailgw.py

@@ -8,7 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id: test_mailgw.py,v 1.73 2004-10-24 10:01:58 a1s Exp $
+# $Id: test_mailgw.py,v 1.73.2.1 2005-02-14 05:55:20 richard Exp $
 
 # TODO: test bcc
 
@@ -979,7 +979,6 @@ def testResentFrom(self):
         self.assertEqual(l, [self.richard_id, self.mary_id])
         return nodeid
 
-
     def testDejaVu(self):
         self.assertRaises(IgnoreLoop, self._handle_mail,
             '''Content-Type: text/plain;
@@ -1006,6 +1005,19 @@ def testItsBulkStupid(self):
 Subject: Re: [issue] Testing...
 
 Hi, I'm on holidays, and this is a dumb auto-responder.
+''')
+
+    def testAutoReplyEmailsAreIgnored(self):
+        self.assertRaises(IgnoreBulk, self._handle_mail,
+            '''Content-Type: text/plain;
+  charset="iso-8859-1"
+From: Chef <[email protected]>
+To: [email protected]
+Cc: richard@test
+Message-Id: <dummy_test_message_id>
+Subject: Re: [issue] Out of office AutoReply: Back next week
+
+Hi, I'm back in the office next week
 ''')
 
 def test_suite():