# HG changeset patch
# User Ben Schmidt
# Date 1327322857 -39600
# Node ID a1ba22fc5a36fb998b8d4aa3f01952ba3e167f8a
# Parent  dc8136010a356419d4ccaa36e431d0d95e30145a
Include reason and type when generating subscription moderation messages.

diff -r dc8136010a35 -r a1ba22fc5a36 README.listtexts
--- a/README.listtexts	Mon Jan 23 17:02:18 2012 +1100
+++ b/README.listtexts	Mon Jan 23 23:47:37 2012 +1100
@@ -67,7 +67,7 @@
   sent to the appropriate moderators when moderation is required because a user
   has submitted a post
 
-- gatekeep-sub (submod-moderator)
+- gatekeep-sub-{request|admin|confirm}-{normal|digest|nomail} (submod-moderator)
   sent to the appropriate gatekeepers when gatekeeping is required because a
   subscription request has been received
 
@@ -75,7 +75,7 @@
   sent to a person submitting a post when they need to wait for moderation
   before it is released to the list
 
-- wait-sub (submod-requester)
+- wait-sub-{request|admin|confirm}-{normal|digest|nomail} (submod-requester)
   sent to a person requesting subscription when they need to wait for
   gatekeeping for permission to join
 
diff -r dc8136010a35 -r a1ba22fc5a36 src/mlmmj-sub.c
--- a/src/mlmmj-sub.c	Mon Jan 23 17:02:18 2012 +1100
+++ b/src/mlmmj-sub.c	Mon Jan 23 23:47:37 2012 +1100
@@ -66,9 +66,9 @@
 	"bouncing"
 };
 
-void moderate_sub(const char *listdir, const char *listaddr,
+static void moderate_sub(const char *listdir, const char *listaddr,
 		const char *listdelim, const char *subaddr,
-		const char *mlmmjsend, enum subtype typesub)
+		const char *mlmmjsend, enum subtype typesub, enum subreason reasonsub)
 {
 	int i, fd, status, nosubmodmails = 0;
 	text *txt;
@@ -161,7 +161,9 @@
 	myfree(moderators);
 
 	txt = open_text(listdir,
-			"gatekeep", "sub", NULL, NULL, "submod-moderator");
+			"gatekeep", "sub",
+			subreason_strs[reasonsub], subtype_strs[typesub],
+			"submod-moderator");
 	MY_ASSERT(txt);
 	register_unformatted(txt, "subaddr", subaddr);
 	register_unformatted(txt, "moderateaddr", replyto); /* DEPRECATED */
@@ -213,7 +215,9 @@
 	from = concatstr(4, listname, listdelim, "bounces-help@", listfqdn);
 
 	txt = open_text(listdir,
-			"wait", "sub", NULL, NULL, "submod-requester");
+			"wait", "sub",
+			subreason_strs[reasonsub], subtype_strs[typesub],
+			"submod-requester");
 	MY_ASSERT(txt);
 	register_unformatted(txt, "subaddr", subaddr);
 	register_unformatted(txt, "moderators", "%gatekeepers"); /* DEPRECATED */
@@ -776,7 +780,7 @@
 				unlink(sublockname);
 				myfree(sublockname);
 				moderate_sub(listdir, listaddr, listdelim,
-					address, mlmmjsend, typesub);
+					address, mlmmjsend, typesub, reasonsub);
 			}
 			lseek(subfilefd, 0L, SEEK_END);
 			len = strlen(address);