CVS: tmda-cgi Install.py,1.32,1.33
Jim Ramsay <[email protected]> Fri, 19 Mar 2004 08:19:10 -0800
| Newsgroups | gmane.mail.spam.tmda.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tmda/tmda-cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4582
Modified Files:
Install.py
Log Message:
Can now guess virtual domain correctly in the case of:
$HOME = /foo/bar/domain.com/n/user
$HOME = /foo/bar/domain.com/user
Index: Install.py
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/Install.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Install.py 18 Mar 2004 17:54:17 -0000 1.32
+++ Install.py 19 Mar 2004 16:19:06 -0000 1.33
@@ -660,7 +660,7 @@
}
Dict["ShortUrlDom"] = re.sub("^www\.", "", Dict["UrlDomain"], re.I)
Dict["qUser"] = re.sub("\.", ":", Dict["User"])
- Match = re.search(".*/([^\./]+\.[^/]+)/[^/]+/?$", Dict["Home"])
+ Match = re.search(".*/([^\./]+\.[^/]+)/([^/]/)?[^/]+/?$", Dict["Home"])
if Match: Dict["Domain"] = Match.group(1)
# Load the display template