changeset 71:489a2ecafb36

Assorted fixes
author mmj
date Mon, 10 May 2004 22:22:21 +1000
parents f94a79c3fb8b
children 42d75f6f0a3d
files README VERSION src/listcontrol.c src/mlmmj-send.c src/mlmmj-sub.c src/mlmmj-unsub.c
diffstat 6 files changed, 20 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/README	Sun May 09 21:48:05 2004 +1000
+++ b/README	Mon May 10 22:22:21 2004 +1000
@@ -1,19 +1,16 @@
-README mlmmj-0.3.4					April 28th 2004
+README mlmmj-0.4.0					May 3rd 2004
 
-This is my attempt at implementing a mailing list manager with the same
+This is an attempt at implementing a mailing list manager with the same
 functionality as the brilliant ezmlm, but with a decent license and mail server
 independency.
 
-The functionality is still quite limited:
+The functionality is still a bit limited, but getting there:
 
  · Subscribe / unsubscribe functionality (email, commandline).
  · Archive
  · Custom headers / footer
  · Primitive bouncehandling
-
-Next feature in the works is bouncehandling--it's now getting there slowly,
-and now bouncing mails will be processed in the bounce/ directory below
-listdir.
+ · Moderation functionality
 
 To use mlmmj, do the following:
 
@@ -82,6 +79,9 @@
    Just add what you want to a file named "footer" in the same dir as
    "customheader".
 
+7) For having a moderated list, simply create a file called 'moderated' in the
+   control/ directory. Moderators are added to a file called 'moderators' in
+   the listdir, just like subscribers are in the subscribers file.
 
 Ah, I almost forgot; If you want to use something else than localhost for your
 maildelivery you have to change it in include/mlmmj.h before compiling.
--- a/VERSION	Sun May 09 21:48:05 2004 +1000
+++ b/VERSION	Mon May 10 22:22:21 2004 +1000
@@ -1,1 +1,1 @@
-0.4.0
+0.4.1
--- a/src/listcontrol.c	Sun May 09 21:48:05 2004 +1000
+++ b/src/listcontrol.c	Mon May 10 22:22:21 2004 +1000
@@ -33,16 +33,18 @@
 	char *controlstr, *conffilename, *moderatefilename;
 	FILE *mailfile, *tempfile;
 	struct email_container fromemails;
+	size_t len;
 	struct stat stbuf;
-	size_t len;
+#if 0
 	int closedlist;
+#endif
 	
 	if((mailfile = fopen(mailfilename, "r")) == NULL) {
 		log_error(LOG_ARGS, "listcontrol, could not open mail");
 		exit(EXIT_FAILURE);
 	}
-	/* Closed list only handling bounces? TODO: part of configfile instead?*/
-	closedlist = statctrl(listdir, "closedlist");
+	/* Closed list only handling bounces?
+	closedlist = statctrl(listdir, "closedlist"); */
 	
 	recipdelimsign = index(controladdr, RECIPDELIM);
 	atsign = index(controladdr, '@');
--- a/src/mlmmj-sub.c	Sun May 09 21:48:05 2004 +1000
+++ b/src/mlmmj-sub.c	Mon May 10 22:22:21 2004 +1000
@@ -89,7 +89,7 @@
 	fclose(queuefile);
 
 	execlp(mlmmjsend, mlmmjsend,
-				"-L", "1",
+				"-l", "1",
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, 0);
--- a/src/mlmmj-unsub.c	Sun May 09 21:48:05 2004 +1000
+++ b/src/mlmmj-unsub.c	Mon May 10 22:22:21 2004 +1000
@@ -91,7 +91,7 @@
 	fclose(queuefile);
 
 	execlp(mlmmjsend, mlmmjsend,
-				"-L", "1",
+				"-l", "1",
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, 0);
@@ -279,6 +279,9 @@
 	/* get the list address */
 	listaddr = getlistaddr(listdir);
 
+	if(unsubconfirm)
+		generate_unsubconfirm(listdir, listaddr, address, mlmmjsend);
+
 	subreadname = concatstr(2, listdir, "/subscribers");
 	subwritename = concatstr(2, listdir, "/subscribers.new");
 
@@ -324,9 +327,6 @@
 		exit(EXIT_FAILURE);
 	}
 
-	if(unsubconfirm)
-		generate_unsubconfirm(listdir, listaddr, address, mlmmjsend);
-	else
 		unsubres = unsubscribe(subread, subwrite, address);
 
 	if(unsubres == 0)