fixes

Author: Richard Jones

roundup/mailer.py

@@ -1,7 +1,7 @@
 """Sending Roundup-specific mail over SMTP.
 """
 __docformat__ = 'restructuredtext'
-# $Id: mailer.py,v 1.11 2006-01-13 02:38:45 richard Exp $
+# $Id: mailer.py,v 1.12 2006-01-20 03:04:14 richard Exp $
 
 import time, quopri, os, socket, smtplib, re
 
@@ -60,7 +60,7 @@ def get_standard_message(self, to, subject, author=None):
         writer.addheader('Subject', encode_header(subject, charset))
         writer.addheader('To', ', '.join(to))
         writer.addheader('From', author)
-        writer.addheader('Date', formatdate(time.gmtime()))
+        writer.addheader('Date', formatdate(time.mktime(time.gmtime())))
 
         # Add a unique Roundup header to help filtering
         writer.addheader('X-Roundup-Name', encode_header(tracker_name,

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.169 2006-01-13 03:56:36 richard Exp $
+$Id: mailgw.py,v 1.170 2006-01-20 03:04:14 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -603,19 +603,6 @@ def handle_message(self, message):
         if not from_list:
             from_list = message.getaddrlist('from')
 
-        # check for registration OTK
-        # or fallback on the default class
-        if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']:
-            otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
-            otk = otk_re.search(m.group('title'))
-            if otk:
-                self.db.confirm_registration(otk.group('otk'))
-                subject = 'Your registration to %s is complete' % \
-                          config['TRACKER_NAME']
-                sendto = [from_list[0][1]]
-                self.mailer.standard_message(sendto, subject, '')
-                return
-
         # XXX Don't enable. This doesn't work yet.
 #  "[^A-z.]tracker\+(?P<classname>[^\d\s]+)(?P<nodeid>\d+)\@some.dom.ain[^A-z.]"
         # handle delivery to addresses like:[email protected]
@@ -656,6 +643,18 @@ def handle_message(self, message):
         # check for well-formed subject line
         m = subject_re.match(subject)
         if m:
+            # check for registration OTK
+            # or fallback on the default class
+            if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']:
+                otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
+                otk = otk_re.search(m.group('title'))
+                if otk:
+                    self.db.confirm_registration(otk.group('otk'))
+                    subject = 'Your registration to %s is complete' % \
+                              config['TRACKER_NAME']
+                    sendto = [from_list[0][1]]
+                    self.mailer.standard_message(sendto, subject, '')
+                    return
             # get the classname
             if pfxmode == 'none':
                 classname = None