From 3b8ebed48d82f26d013bae4944ab3d1bdae7199d Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Mon, 20 Aug 2001 15:07:45 +0000
Subject: ScriptURL(): Instead of using DEFAULT_URL directly, use    
 DEFAULT_URL_PATTERN and interpolate in the calculated web-request     based
 host name (via get_domain()).  This should improve vhost     support.

get_site_email(): Calculate hostname by looking up get_domain()
    results in VIRTUAL_HOSTS, defaulting to get_domain() if no vhost
    information was set.
---
 Mailman/Utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 0d21b3032..36913c926 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -203,7 +203,7 @@ def ScriptURL(target, web_page_url=None, absolute=0):
     absolute - a flag which if set, generates an absolute url
     """
     if web_page_url is None:
-        web_page_url = mm_cfg.DEFAULT_URL
+        web_page_url = mm_cfg.DEFAULT_URL_PATTERN % get_domain()
         if web_page_url[-1] <> '/':
             web_page_url = web_page_url + '/'
     fullpath = os.environ.get('REQUEST_URI')
@@ -636,7 +636,7 @@ def get_domain():
 
 def get_site_email(hostname=None, extra=''):
     if hostname is None:
-        hostname = get_domain()
+        hostname = mm_cfg.VIRTUAL_HOSTS.get(get_domain(), get_domain())
     return '%s%s@%s' % (mm_cfg.MAILMAN_SITE_LIST, extra, hostname)
 
 
-- 
cgit v1.3.1