summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mailman/Bouncer.py4
-rw-r--r--Mailman/Deliverer.py8
-rw-r--r--Mailman/Digester.py5
-rw-r--r--Mailman/HTMLFormatter.py6
-rw-r--r--Mailman/ListAdmin.py4
-rw-r--r--Mailman/MailCommandHandler.py6
-rw-r--r--modules/mm_admin.py4
-rw-r--r--modules/mm_bouncer.py4
-rw-r--r--modules/mm_deliver.py8
-rw-r--r--modules/mm_digest.py5
-rw-r--r--modules/mm_html.py6
-rw-r--r--modules/mm_mailcmd.py6
12 files changed, 34 insertions, 32 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py
index 463e6b461..8845861d0 100644
--- a/Mailman/Bouncer.py
+++ b/Mailman/Bouncer.py
@@ -17,7 +17,7 @@
"Handle delivery bounce messages, doing filtering when list is set for it."
-__version__ = "$Revision: 547 $"
+__version__ = "$Revision: 693 $"
# It's possible to get the mail-list senders address (list-admin) in the
# bounce list. You probably don't want to have list mail sent to that
@@ -189,7 +189,7 @@ class Bouncer:
text.append("You can reenable their subscription by visiting "
"their options page")
text.append("(via %s) and using your"
- % self.GetScriptURL('listinfo'))
+ % self.GetAbsoluteScriptURL('listinfo'))
text.append(
"list admin password to authorize the option change.")
text.append("")
diff --git a/Mailman/Deliverer.py b/Mailman/Deliverer.py
index 30bbc07a0..c9ca8ef60 100644
--- a/Mailman/Deliverer.py
+++ b/Mailman/Deliverer.py
@@ -173,7 +173,7 @@ class Deliverer:
# Trim off subject prefix
subject = subject[len(sp) + 1:]
body = POSTACKTEXT % (subject, self.real_name,
- self.GetScriptURL('listinfo'))
+ self.GetAbsoluteScriptURL('listinfo'))
self.SendTextToUser('%s post acknowlegement' % self.real_name,
body, sender)
@@ -187,8 +187,8 @@ class Deliverer:
'host_name' : self.host_name,
'welcome' : welcome,
'emailaddr' : self.GetListEmail(),
- 'generalurl': self.GetScriptURL('listinfo'),
- 'optionsurl': self.GetOptionsURL(name),
+ 'generalurl': self.GetAbsoluteScriptURL('listinfo'),
+ 'optionsurl': self.GetAbsoluteOptionsURL(name),
'password' : password,
}
return body
@@ -226,7 +226,7 @@ class Deliverer:
text = USERPASSWORDTEXT % (user,
self.real_name,
self.passwords[user],
- self.GetOptionsURL(user),
+ self.GetAbsoluteOptionsURL(user),
self.GetRequestEmail(),
self.GetAdminEmail())
else:
diff --git a/Mailman/Digester.py b/Mailman/Digester.py
index 1df4e006b..79fac28de 100644
--- a/Mailman/Digester.py
+++ b/Mailman/Digester.py
@@ -17,7 +17,7 @@
"""Mixin class with list-digest handling methods and settings."""
-__version__ = "$Revision: 669 $"
+__version__ = "$Revision: 693 $"
import mm_utils, mm_err, mm_message, mm_cfg
import time, os, string, re
@@ -320,7 +320,8 @@ class Digest:
lst = self.list
substs = {}
substs.update(lst.__dict__)
- substs.update({'got_listinfo_url': lst.GetScriptURL('listinfo'),
+ substs.update({'got_listinfo_url':
+ lst.GetAbsoluteScriptURL('listinfo'),
'got_request_email': lst.GetRequestEmail(),
'got_list_email': lst.GetListEmail(),
'got_owner_email': lst.GetAdminEmail(),
diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py
index dcab91891..d5b971029 100644
--- a/Mailman/HTMLFormatter.py
+++ b/Mailman/HTMLFormatter.py
@@ -17,7 +17,7 @@
"""Routines for presentation of list-specific HTML text."""
-__version__ = "$Revision: 547 $"
+__version__ = "$Revision: 693 $"
import os
@@ -87,7 +87,7 @@ class HTMLFormatter:
showing = ObscureEmail(person, for_text=1)
else:
showing = person
- got = Link(os.path.join(me.GetScriptURL('options'),
+ got = Link(os.path.join(me.GetRelativeScriptURL('options'),
id), showing)
if me.GetUserOption(person, disdel):
got = Italic("(", got, ")")
@@ -261,7 +261,7 @@ class HTMLFormatter:
return container
def FormatFormStart(self, name, extra=''):
- base_url = self.GetScriptURL(name)
+ base_url = self.GetRelativeScriptURL(name)
full_url = os.path.join(base_url, extra)
return ('<FORM Method=POST ACTION="%s">' % full_url)
diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py
index 67fd75826..a1d775900 100644
--- a/Mailman/ListAdmin.py
+++ b/Mailman/ListAdmin.py
@@ -77,7 +77,7 @@ class ListAdmin:
% (who,
self.real_name,
self.host_name,
- self.GetScriptURL('admindb'))))
+ self.GetAbsoluteScriptURL('admindb'))))
raise mm_err.MMNeedApproval, "Admin approval required to subscribe"
elif request == 'post':
@@ -97,7 +97,7 @@ class ListAdmin:
reason,
sender,
subject,
- self.GetScriptURL('admindb'))))
+ self.GetAbsoluteScriptURL('admindb'))))
raise mm_err.MMNeedApproval, args[1]
def CleanRequests(self):
diff --git a/Mailman/MailCommandHandler.py b/Mailman/MailCommandHandler.py
index 232a4e95b..745327394 100644
--- a/Mailman/MailCommandHandler.py
+++ b/Mailman/MailCommandHandler.py
@@ -17,7 +17,7 @@
"""Process maillist user commands arriving via email."""
-__version__ = "$Revision: 632 $"
+__version__ = "$Revision: 693 $"
# Try to stay close to majordomo commands, but accept common mistakes.
# Not implemented: get / index / which.
@@ -300,7 +300,7 @@ class MailCommandHandler:
" background" % self.real_name)
self.AddToResponse("and instructions for subscribing to and"
" using it, visit:\n\n\t%s\n"
- % self.GetScriptURL('listinfo'))
+ % self.GetAbsoluteScriptURL('listinfo'))
if not self.info:
self.AddToResponse("No other details about %s are available." %
@@ -601,7 +601,7 @@ Commands should be sent to %s
Questions and concerns for the attention of a person should be sent to
%s
""" % (mm_cfg.VERSION,
- self.GetScriptURL('listinfo'),
+ self.GetAbsoluteScriptURL('listinfo'),
self.GetRequestEmail(),
self.GetAdminEmail()))
diff --git a/modules/mm_admin.py b/modules/mm_admin.py
index 67fd75826..a1d775900 100644
--- a/modules/mm_admin.py
+++ b/modules/mm_admin.py
@@ -77,7 +77,7 @@ class ListAdmin:
% (who,
self.real_name,
self.host_name,
- self.GetScriptURL('admindb'))))
+ self.GetAbsoluteScriptURL('admindb'))))
raise mm_err.MMNeedApproval, "Admin approval required to subscribe"
elif request == 'post':
@@ -97,7 +97,7 @@ class ListAdmin:
reason,
sender,
subject,
- self.GetScriptURL('admindb'))))
+ self.GetAbsoluteScriptURL('admindb'))))
raise mm_err.MMNeedApproval, args[1]
def CleanRequests(self):
diff --git a/modules/mm_bouncer.py b/modules/mm_bouncer.py
index 463e6b461..8845861d0 100644
--- a/modules/mm_bouncer.py
+++ b/modules/mm_bouncer.py
@@ -17,7 +17,7 @@
"Handle delivery bounce messages, doing filtering when list is set for it."
-__version__ = "$Revision: 547 $"
+__version__ = "$Revision: 693 $"
# It's possible to get the mail-list senders address (list-admin) in the
# bounce list. You probably don't want to have list mail sent to that
@@ -189,7 +189,7 @@ class Bouncer:
text.append("You can reenable their subscription by visiting "
"their options page")
text.append("(via %s) and using your"
- % self.GetScriptURL('listinfo'))
+ % self.GetAbsoluteScriptURL('listinfo'))
text.append(
"list admin password to authorize the option change.")
text.append("")
diff --git a/modules/mm_deliver.py b/modules/mm_deliver.py
index 30bbc07a0..c9ca8ef60 100644
--- a/modules/mm_deliver.py
+++ b/modules/mm_deliver.py
@@ -173,7 +173,7 @@ class Deliverer:
# Trim off subject prefix
subject = subject[len(sp) + 1:]
body = POSTACKTEXT % (subject, self.real_name,
- self.GetScriptURL('listinfo'))
+ self.GetAbsoluteScriptURL('listinfo'))
self.SendTextToUser('%s post acknowlegement' % self.real_name,
body, sender)
@@ -187,8 +187,8 @@ class Deliverer:
'host_name' : self.host_name,
'welcome' : welcome,
'emailaddr' : self.GetListEmail(),
- 'generalurl': self.GetScriptURL('listinfo'),
- 'optionsurl': self.GetOptionsURL(name),
+ 'generalurl': self.GetAbsoluteScriptURL('listinfo'),
+ 'optionsurl': self.GetAbsoluteOptionsURL(name),
'password' : password,
}
return body
@@ -226,7 +226,7 @@ class Deliverer:
text = USERPASSWORDTEXT % (user,
self.real_name,
self.passwords[user],
- self.GetOptionsURL(user),
+ self.GetAbsoluteOptionsURL(user),
self.GetRequestEmail(),
self.GetAdminEmail())
else:
diff --git a/modules/mm_digest.py b/modules/mm_digest.py
index 1df4e006b..79fac28de 100644
--- a/modules/mm_digest.py
+++ b/modules/mm_digest.py
@@ -17,7 +17,7 @@
"""Mixin class with list-digest handling methods and settings."""
-__version__ = "$Revision: 669 $"
+__version__ = "$Revision: 693 $"
import mm_utils, mm_err, mm_message, mm_cfg
import time, os, string, re
@@ -320,7 +320,8 @@ class Digest:
lst = self.list
substs = {}
substs.update(lst.__dict__)
- substs.update({'got_listinfo_url': lst.GetScriptURL('listinfo'),
+ substs.update({'got_listinfo_url':
+ lst.GetAbsoluteScriptURL('listinfo'),
'got_request_email': lst.GetRequestEmail(),
'got_list_email': lst.GetListEmail(),
'got_owner_email': lst.GetAdminEmail(),
diff --git a/modules/mm_html.py b/modules/mm_html.py
index dcab91891..d5b971029 100644
--- a/modules/mm_html.py
+++ b/modules/mm_html.py
@@ -17,7 +17,7 @@
"""Routines for presentation of list-specific HTML text."""
-__version__ = "$Revision: 547 $"
+__version__ = "$Revision: 693 $"
import os
@@ -87,7 +87,7 @@ class HTMLFormatter:
showing = ObscureEmail(person, for_text=1)
else:
showing = person
- got = Link(os.path.join(me.GetScriptURL('options'),
+ got = Link(os.path.join(me.GetRelativeScriptURL('options'),
id), showing)
if me.GetUserOption(person, disdel):
got = Italic("(", got, ")")
@@ -261,7 +261,7 @@ class HTMLFormatter:
return container
def FormatFormStart(self, name, extra=''):
- base_url = self.GetScriptURL(name)
+ base_url = self.GetRelativeScriptURL(name)
full_url = os.path.join(base_url, extra)
return ('<FORM Method=POST ACTION="%s">' % full_url)
diff --git a/modules/mm_mailcmd.py b/modules/mm_mailcmd.py
index 232a4e95b..745327394 100644
--- a/modules/mm_mailcmd.py
+++ b/modules/mm_mailcmd.py
@@ -17,7 +17,7 @@
"""Process maillist user commands arriving via email."""
-__version__ = "$Revision: 632 $"
+__version__ = "$Revision: 693 $"
# Try to stay close to majordomo commands, but accept common mistakes.
# Not implemented: get / index / which.
@@ -300,7 +300,7 @@ class MailCommandHandler:
" background" % self.real_name)
self.AddToResponse("and instructions for subscribing to and"
" using it, visit:\n\n\t%s\n"
- % self.GetScriptURL('listinfo'))
+ % self.GetAbsoluteScriptURL('listinfo'))
if not self.info:
self.AddToResponse("No other details about %s are available." %
@@ -601,7 +601,7 @@ Commands should be sent to %s
Questions and concerns for the attention of a person should be sent to
%s
""" % (mm_cfg.VERSION,
- self.GetScriptURL('listinfo'),
+ self.GetAbsoluteScriptURL('listinfo'),
self.GetRequestEmail(),
self.GetAdminEmail()))
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-09 12:07:23 +0000