merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -10,6 +10,9 @@ Fixed:
 - fixed documentation of filter() in the case of multiple values in a
   String search (sf bug 1373396)
 - fix comma-separated ID filter spec in web requests (sf bug 1396278)
+- fix Date: header generation to be LOCALE-agnostic (sf bug 1352624)
+- fix admin doc description of roundup-server config file
+- fix redirect after instant registration (sf bug 1381676)
 
 
 2005-10-07 0.8.5

doc/admin_guide.txt

@@ -2,7 +2,7 @@
 Administration Guide
 ====================
 
-:Version: $Revision: 1.15.2.3 $
+:Version: $Revision: 1.15.2.4 $
 
 .. contents::
 
@@ -73,7 +73,7 @@ Configuring roundup-server
 The basic configuration file layout is as follows (take from the
 ``roundup-server.ini.example`` file in the "doc" directory)::
 
-    [server]
+    [main]
     port = 8080
     ;hostname = 
     ;user = 
@@ -82,9 +82,9 @@ The basic configuration file layout is as follows (take from the
     ;pidfile = 
     ;logfile = 
 
+    [trackers]
     ; Add one of these per tracker being served
-    [tracker_url_component]
-    home = /path/to/tracker
+    name = /path/to/tracker/name
 
 Values ";commented out" are optional. The meaning of the various options
 are as follows:
@@ -108,13 +108,10 @@ are as follows:
   written to this file. It must be specified if **pidfile** is specified.
   If per-tracker logging is specified, then very little will be written to
   this file.
-**example_tracker** sections
-  These are used to specify which Roundup trackers are to be served up by
-  roundup-server. Each tracker has its own ``[section]`` with a single
-  ``home`` value defined pointing to the tracker's home. The section name is
-  used in the URL to select the appropriate reacker. Make sure the name part
-  doesn't include any url-unsafe characters like spaces. Stick to
-  alphanumeric characters and you'll be ok.
+**trackers** section
+  Each line denotes a mapping from a URL component to a tracker home.
+  Make sure the name part doesn't include any url-unsafe characters like
+  spaces. Stick to alphanumeric characters and you'll be ok.
 
 
 Users and Security

roundup/cgi/actions.py

@@ -1,4 +1,4 @@
-#$Id: actions.py,v 1.40.2.8 2005-07-07 06:44:35 richard Exp $
+#$Id: actions.py,v 1.40.2.9 2006-01-13 03:34:34 richard Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random, csv
 
@@ -788,8 +788,7 @@ def handle(self):
 
             # finish off by logging the user in
             self.userid = self.nodeid
-            self.finishRego()
-            return
+            return self.finishRego()
 
         # generate the one-time-key and store the props for later
         for propname, proptype in self.db.user.getprops().items():

roundup/mailer.py

@@ -1,7 +1,7 @@
 """Sending Roundup-specific mail over SMTP.
 """
 __docformat__ = 'restructuredtext'
-# $Id: mailer.py,v 1.10 2004-07-25 15:25:44 a1s Exp $
+# $Id: mailer.py,v 1.10.2.1 2006-01-13 03:34:34 richard Exp $
 
 import time, quopri, os, socket, smtplib, re
 
@@ -11,6 +11,12 @@
 from roundup.rfc2822 import encode_header
 from roundup import __version__
 
+try:
+    from email.Utils import formatdate
+except ImportError:
+    def formatdate(timeval):
+        return time.strftime("%a, %d %b %Y %H:%M:%S +0000", timeval)
+
 class MessageSendError(RuntimeError):
     pass
 
@@ -54,8 +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', time.strftime("%a, %d %b %Y %H:%M:%S +0000",
-                                               time.gmtime()))
+        writer.addheader('Date', formatdate(time.gmtime()))
 
         # Add a unique Roundup header to help filtering
         writer.addheader('X-Roundup-Name', encode_header(tracker_name,