![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/cgi-bin/roundup.cgi b/cgi-bin/roundup.cgi
index a34cf3a3a81e575c0d63fab64a7e5ebf1f61d814..1518c400b98111965ddeb1bc662dddc9103afc2b 100755 (executable)
--- a/cgi-bin/roundup.cgi
+++ b/cgi-bin/roundup.cgi
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#
-# $Id: roundup.cgi,v 1.27 2002-09-04 02:11:00 richard Exp $
+# $Id: roundup.cgi,v 1.33 2002-09-23 00:50:32 richard Exp $
# python version check
from roundup import version_check
# documented below are set, they _override_ any configuation defaults
# given in this file.
-# ROUNDUP_INSTANCE_HOMES is a list of instances, in the form
+# TRACKER_HOMES is a list of instances, in the form
# "NAME=DIR<sep>NAME2=DIR2<sep>...", where <sep> is the directory path
# separator (";" on Windows, ":" on Unix).
+# Make sure the NAME part doesn't include any url-unsafe characters like
+# spaces, as these confuse the cookie handling in browsers like IE.
+
# ROUNDUP_LOG is the name of the logfile; if it's empty or does not exist,
# logging is turned off (unless you changed the default below).
# used in the code. Higher numbers means more debugging output.
# This indicates where the Roundup instance lives
-ROUNDUP_INSTANCE_HOMES = {
+TRACKER_HOMES = {
'demo': '/var/roundup/instances/demo',
}
#
try:
import traceback, StringIO, cgi
- from roundup import cgitb
+ from roundup.cgi import cgitb
except:
print "Content-Type: text/plain\n"
print _("Failed to import cgitb!\n\n")
#
def checkconfig():
import os, string
- global ROUNDUP_INSTANCE_HOMES, LOG
+ global TRACKER_HOMES, LOG
- homes = os.environ.get('ROUNDUP_INSTANCE_HOMES', '')
+ # see if there's an environment var. ROUNDUP_INSTANCE_HOMES is the
+ # old name for it.
+ if os.environ.has_key('ROUNDUP_INSTANCE_HOMES'):
+ homes = os.environ.get('ROUNDUP_INSTANCE_HOMES')
+ else:
+ homes = os.environ.get('TRACKER_HOMES', '')
if homes:
- ROUNDUP_INSTANCE_HOMES = {}
+ TRACKER_HOMES = {}
for home in string.split(homes, os.pathsep):
try:
name, dir = string.split(home, '=', 1)
# ignore invalid definitions
continue
if name and dir:
- ROUNDUP_INSTANCE_HOMES[name] = dir
+ TRACKER_HOMES[name] = dir
logname = os.environ.get('ROUNDUP_LOG', '')
if logname:
import os, string
import roundup.instance
path = string.split(os.environ.get('PATH_INFO', '/'), '/')
+ request = RequestWrapper(out)
+ request.path = os.environ.get('PATH_INFO', '/')
instance = path[1]
- os.environ['INSTANCE_NAME'] = instance
+ os.environ['TRACKER_NAME'] = instance
os.environ['PATH_INFO'] = string.join(path[2:], '/')
- request = RequestWrapper(out)
- if ROUNDUP_INSTANCE_HOMES.has_key(instance):
+ if TRACKER_HOMES.has_key(instance):
# redirect if we need a trailing '/'
if len(path) == 2:
request.send_response(301)
- absolute_url = 'http://%s%s/'%(os.environ['HTTP_HOST'],
+ # redirect
+ if os.environ.get('HTTPS', '') == 'on':
+ protocol = 'https'
+ else:
+ protocol = 'http'
+ absolute_url = '%s://%s%s/'%(protocol, os.environ['HTTP_HOST'],
os.environ['REQUEST_URI'])
request.send_header('Location', absolute_url)
request.end_headers()
out.write('Moved Permanently')
else:
- instance_home = ROUNDUP_INSTANCE_HOMES[instance]
+ instance_home = TRACKER_HOMES[instance]
instance = roundup.instance.open(instance_home)
from roundup.cgi.client import Unauthorised, NotFound
client = instance.Client(instance, request, os.environ)
w = request.write
w(_('<html><head><title>Roundup instances index</title></head>\n'))
w(_('<body><h1>Roundup instances index</h1><ol>\n'))
- homes = ROUNDUP_INSTANCE_HOMES.keys()
+ homes = TRACKER_HOMES.keys()
homes.sort()
for instance in homes:
w(_('<li><a href="%(instance_url)s/index">%(instance_name)s</a>\n')%{
sys.stdout, sys.stderr = out, err
LOG.close()
-#
-# $Log: not supported by cvs2svn $
-# Revision 1.26 2002/09/04 01:58:33 richard
-# fix cgi client importing
-#
-# Revision 1.25 2002/08/22 00:14:18 richard
-# Fix to be able to report errors even if the cgi module can't be imported(!)
-#
-# Revision 1.24 2002/01/05 02:21:22 richard
-# fixes
-#
-# Revision 1.23 2002/01/05 02:19:03 richard
-# i18n'ification
-#
-# Revision 1.22 2001/12/13 00:20:01 richard
-# . Centralised the python version check code, bumped version to 2.1.1 (really
-# needs to be 2.1.2, but that isn't released yet :)
-#
-# Revision 1.21 2001/12/02 05:06:16 richard
-# . We now use weakrefs in the Classes to keep the database reference, so
-# the close() method on the database is no longer needed.
-# I bumped the minimum python requirement up to 2.1 accordingly.
-# . #487480 ] roundup-server
-# . #487476 ] INSTALL.txt
-#
-# I also cleaned up the change message / post-edit stuff in the cgi client.
-# There's now a clearly marked "TODO: append the change note" where I believe
-# the change note should be added there. The "changes" list will obviously
-# have to be modified to be a dict of the changes, or somesuch.
-#
-# More testing needed.
-#
-# Revision 1.20 2001/11/26 22:55:56 richard
-# Feature:
-# . Added INSTANCE_NAME to configuration - used in web and email to identify
-# the instance.
-# . Added EMAIL_SIGNATURE_POSITION to indicate where to place the roundup
-# signature info in e-mails.
-# . Some more flexibility in the mail gateway and more error handling.
-# . Login now takes you to the page you back to the were denied access to.
-#
-# Fixed:
-# . Lots of bugs, thanks Roché and others on the devel mailing list!
-#
-# Revision 1.19 2001/11/22 00:25:10 richard
-# quick fix for file uploads on windows in roundup.cgi
-#
-# Revision 1.18 2001/11/06 22:10:11 jhermann
-# Added env config; fixed request wrapper & index list; sort list by key
-#
-# Revision 1.17 2001/11/06 21:51:19 richard
-# Fixed HTTP headers for top-level index in CGI script
-#
-# Revision 1.16 2001/11/01 22:04:37 richard
-# Started work on supporting a pop3-fetching server
-# Fixed bugs:
-# . bug #477104 ] HTML tag error in roundup-server
-# . bug #477107 ] HTTP header problem
-#
-# Revision 1.15 2001/10/29 23:55:44 richard
-# Fix to CGI top-level index (thanks Juergen Hermann)
-#
-# Revision 1.14 2001/10/27 00:22:35 richard
-# Fixed some URL issues in roundup.cgi, again thanks Juergen Hermann.
-#
-# Revision 1.13 2001/10/05 02:23:24 richard
-# . roundup-admin create now prompts for property info if none is supplied
-# on the command-line.
-# . hyperdb Class getprops() method may now return only the mutable
-# properties.
-# . Login now uses cookies, which makes it a whole lot more flexible. We can
-# now support anonymous user access (read-only, unless there's an
-# "anonymous" user, in which case write access is permitted). Login
-# handling has been moved into cgi_client.Client.main()
-# . The "extended" schema is now the default in roundup init.
-# . The schemas have had their page headings modified to cope with the new
-# login handling. Existing installations should copy the interfaces.py
-# file from the roundup lib directory to their instance home.
-# . Incorrectly had a Bizar Software copyright on the cgitb.py module from
-# Ping - has been removed.
-# . Fixed a whole bunch of places in the CGI interface where we should have
-# been returning Not Found instead of throwing an exception.
-# . Fixed a deviation from the spec: trying to modify the 'id' property of
-# an item now throws an exception.
-#
-# Revision 1.12 2001/10/01 05:55:41 richard
-# Fixes to the top-level index
-#
-# Revision 1.11 2001/09/29 13:27:00 richard
-# CGI interfaces now spit up a top-level index of all the instances they can
-# serve.
-#
-# Revision 1.10 2001/08/07 00:24:42 richard
-# stupid typo
-#
-# Revision 1.9 2001/08/07 00:15:51 richard
-# Added the copyright/license notice to (nearly) all files at request of
-# Bizar Software.
-#
-# Revision 1.8 2001/08/05 07:43:52 richard
-# Instances are now opened by a special function that generates a unique
-# module name for the instances on import time.
-#
-# Revision 1.7 2001/08/03 01:28:33 richard
-# Used the much nicer load_package, pointed out by Steve Majewski.
-#
-# Revision 1.6 2001/08/03 00:59:34 richard
-# Instance import now imports the instance using imp.load_module so that
-# we can have instance homes of "roundup" or other existing python package
-# names.
-#
-# Revision 1.5 2001/07/29 07:01:39 richard
-# Added vim command to all source so that we don't get no steenkin' tabs :)
-#
-# Revision 1.4 2001/07/23 04:47:27 anthonybaxter
-# renamed ROUNDUPS to ROUNDUP_INSTANCE_HOMES
-# sys.exit(0) if python version wrong.
-#
-# Revision 1.3 2001/07/23 04:33:30 richard
-# brought the CGI instance config dict in line with roundup-server
-#
-# Revision 1.2 2001/07/23 04:31:40 richard
-# Fixed the roundup CGI script for updates to cgi_client.py
-#
-# Revision 1.1 2001/07/22 11:47:07 richard
-# More Grande Splite
-#
-#
# vim: set filetype=python ts=4 sw=4 et si