From 01682a82d97143203eb2e593fced13600e3708f4 Mon Sep 17 00:00:00 2001
From: klm
Date: Sun, 29 Mar 1998 03:56:52 +0000
Subject: Add digest specifier to subscribe command text when subscriber
 selected digest from the web page.  (This goes along with untangling in
 maillist.py that fixed problem where digest subscriptions were accepted from
 web, despite WebSubscribeRequiresConfirmation being set.  Should have
 mentioned this in that checkin , but oh well.)

---
 cgi/subscribe | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'cgi')

diff --git a/cgi/subscribe b/cgi/subscribe
index f521687fd..a7ef48dd9 100755
--- a/cgi/subscribe
+++ b/cgi/subscribe
@@ -13,7 +13,7 @@ you against your wishes.  In order to complete this subscription you
 must send a confirming email, to %s, by 
 repling to this mail, and including just the line: 
 
-subscribe %s
+subscribe %s%s
 
 in the body or as the subject line.  If you do not actually wish to
 subscribe you need not do anything.  Upon subscribing you will receive 
@@ -139,6 +139,10 @@ else:
 	    remote = " from %s." % os.environ['REMOTE_ADDR']
 	else:
 	    remote = "."
+        if digest:
+            digesting = " digest"
+        else:
+            digesting = ""
 	list.SendTextToUser(subject = 'Subscribing to %s' % list.real_name,
 			    recipient = email,
 			    sender = list.GetRequestEmail(),
@@ -147,7 +151,8 @@ else:
                                        list.host_name,
                                        remote,
                                        list.GetRequestEmail(),
-                                       pw)),
+                                       pw,
+                                       digesting)),
                             errorsto = list.GetAdminEmail())
     except mm_err.MMBadEmailError:
 	results = results + ("Mailman won't accept the given email "
-- 
cgit v1.2.3-70-g09d2