backporting changes from HEAD

Author: Richard Jones

CHANGES.txt

@@ -10,6 +10,9 @@ are given with the most recent entry first.
 - fixed roundup-reminder (sf bug 681042)
 - fixed int assumptions about Number values (sf bug 677762)
 - clarified licensing
+- another attempt to fix cookie misbehaviour - customise cookie name using
+  tracker name
+- fixed error in indexargs_url (thanks Patrick Ohly)
 
 
 2003-01-24 0.5.5

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.65.2.3 2003-02-06 05:44:49 richard Exp $
+# $Id: client.py,v 1.65.2.4 2003-02-08 23:03:36 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -95,6 +95,8 @@ def __init__(self, instance, request, env, form=None):
         # this is the "cookie path" for this tracker (ie. the path part of
         # the "base" url)
         self.cookie_path = urlparse.urlparse(self.base)[2]
+        self.cookie_name = 'roundup_session_' + re.sub('[^a-zA-Z]', '',
+            self.instance.config.TRACKER_NAME)
 
         # see if we need to re-parse the environment for the form (eg Zope)
         if form is None:
@@ -217,11 +219,11 @@ def determine_user(self):
         user = 'anonymous'
 
         # bump the "revision" of the cookie since the format changed
-        if (cookie.has_key('roundup_user_2') and
-                cookie['roundup_user_2'].value != 'deleted'):
+        if (cookie.has_key(self.cookie_name) and
+                cookie[self.cookie_name].value != 'deleted'):
 
             # get the session key from the cookie
-            self.session = cookie['roundup_user_2'].value
+            self.session = cookie[self.cookie_name].value
             # get the user from the session
             try:
                 # update the lifetime datestamp
@@ -475,8 +477,8 @@ def set_cookie(self, user):
 
         # generate the cookie path - make sure it has a trailing '/'
         self.additional_headers['Set-Cookie'] = \
-          'roundup_user_2=%s; expires=%s; Path=%s;'%(self.session, expire,
-            self.cookie_path)
+          '%s=%s; expires=%s; Path=%s;'%(self.cookie_name, self.session,
+            expire, self.cookie_path)
 
     def make_user_anonymous(self):
         ''' Make us anonymous
@@ -572,8 +574,8 @@ def logout_action(self):
         # construct the logout cookie
         now = Cookie._getdate()
         self.additional_headers['Set-Cookie'] = \
-           'roundup_user_2=deleted; Max-Age=0; expires=%s; Path=%s;'%(now,
-            self.cookie_path)
+           '%s=deleted; Max-Age=0; expires=%s; Path=%s;'%(self.cookie_name,
+            now, self.cookie_path)
 
         # Let the user know what's going on
         self.ok_message.append(_('You are logged out'))

roundup/cgi/templating.py

@@ -1491,7 +1491,7 @@ def indexargs_url(self, url, args):
             else:
                 val = self.group[1]
             l.append(':group=%s'%val)
-        if self.filter and not args.has_key(':columns'):
+        if self.filter and not args.has_key(':filter'):
             l.append(':filter=%s'%(','.join(self.filter)))
         for k,v in self.filterspec.items():
             if not args.has_key(k):