From 079d197c284a7393d56743e4edc46c39cd5b8a9f Mon Sep 17 00:00:00 2001
From: klm
Date: Sat, 11 Apr 1998 19:38:45 +0000
Subject: ApprovedAddMember(): Add a no-acknowledement option, eg for
 subscription of one list to another.

---
 Mailman/MailList.py | 9 +++++----
 modules/maillist.py | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 2252a5730..135aede56 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1,6 +1,6 @@
 "The class representing a mailman maillist.  Mixes in many feature classes."
 
-__version__ = "$Revision: 409 $"
+__version__ = "$Revision: 436 $"
 
 try:
     import mm_cfg
@@ -196,7 +196,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
              " maillist messages in mailbox summaries."),
 
 	    ('welcome_msg', mm_cfg.Text, (4, 50), 0,
-	     'List-specific text appended to new-subscriber welcome message'),
+	     'List-specific text prepended to new-subscriber welcome message'),
 
 	    ('goodbye_msg', mm_cfg.Text, (4, 50), 0,
 	     'Text sent to people leaving the list.  If empty, no special'
@@ -539,7 +539,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
             # Blanket admin approval requred...
             self.AddRequest('add_member', digest, name, password)
 
-    def ApprovedAddMember(self, name, password, digest):
+    def ApprovedAddMember(self, name, password, digest, noack=0):
         # XXX klm: It *might* be nice to leave the case of the name alone,
         #          but provide a common interface that always returns the
         #          lower case version for computations.
@@ -556,7 +556,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
                     self._internal_name, kind, name)
 	self.passwords[name] = password
 	self.Save()
-	self.SendSubscribeAck(name, password, digest)
+        if not noack:
+            self.SendSubscribeAck(name, password, digest)
 
     def DeleteMember(self, name, whence=None):
 	self.IsListInitialized()
diff --git a/modules/maillist.py b/modules/maillist.py
index 2252a5730..135aede56 100644
--- a/modules/maillist.py
+++ b/modules/maillist.py
@@ -1,6 +1,6 @@
 "The class representing a mailman maillist.  Mixes in many feature classes."
 
-__version__ = "$Revision: 409 $"
+__version__ = "$Revision: 436 $"
 
 try:
     import mm_cfg
@@ -196,7 +196,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
              " maillist messages in mailbox summaries."),
 
 	    ('welcome_msg', mm_cfg.Text, (4, 50), 0,
-	     'List-specific text appended to new-subscriber welcome message'),
+	     'List-specific text prepended to new-subscriber welcome message'),
 
 	    ('goodbye_msg', mm_cfg.Text, (4, 50), 0,
 	     'Text sent to people leaving the list.  If empty, no special'
@@ -539,7 +539,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
             # Blanket admin approval requred...
             self.AddRequest('add_member', digest, name, password)
 
-    def ApprovedAddMember(self, name, password, digest):
+    def ApprovedAddMember(self, name, password, digest, noack=0):
         # XXX klm: It *might* be nice to leave the case of the name alone,
         #          but provide a common interface that always returns the
         #          lower case version for computations.
@@ -556,7 +556,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
                     self._internal_name, kind, name)
 	self.passwords[name] = password
 	self.Save()
-	self.SendSubscribeAck(name, password, digest)
+        if not noack:
+            self.SendSubscribeAck(name, password, digest)
 
     def DeleteMember(self, name, whence=None):
 	self.IsListInitialized()
-- 
cgit v1.2.3-70-g09d2