X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Flistdeliver%2Fserv_listdeliver.c;h=7dd34630a0750c5fc5977fcf4f663163a50d18b9;hb=2d108c1f33c86b501a2540ba48eaedded8894f20;hp=75f2d6759f0ac5cd214704c958eb3e992fa8331a;hpb=8f575fc90b5bb9f934bf8ad115d580f5929ffbe5;p=citadel.git

diff --git a/citadel/modules/listdeliver/serv_listdeliver.c b/citadel/modules/listdeliver/serv_listdeliver.c
index 75f2d6759..7dd34630a 100644
--- a/citadel/modules/listdeliver/serv_listdeliver.c
+++ b/citadel/modules/listdeliver/serv_listdeliver.c
@@ -53,17 +53,40 @@ struct lddata {
 
 void listdeliver_do_msg(long msgnum, void *userdata) {
 	struct lddata *ld = (struct lddata *) userdata;
-	ld->msgnum = msgnum;
+	if (!ld) return;
 	char buf[SIZ];
 
-	struct CtdlMessage *TheMessage = CtdlFetchMessage(msgnum, 1);
+	ld->msgnum = msgnum;
+	if (msgnum <= 0) return;
 
-	int config_lines = num_tokens(ld->netconf, '\n');
-	for (int i=0; i<config_lines; ++i) {
-		extract_token(buf, ld->netconf, i, '\n', sizeof buf);
-		if ( (!strncasecmp(buf, "listrecp|", 9)) || (!strncasecmp(buf, "digestrecp|", 11)) ) {
-			syslog(LOG_DEBUG, "\033[32mDeliver %ld to %s\033[0m", msgnum, buf);
-			// FIXME
+	struct CtdlMessage *TheMessage = CtdlFetchMessage(msgnum, 1);
+	if (!TheMessage) return;
+
+	char *recipients = malloc(strlen(ld->netconf));
+	if (recipients) {
+		recipients[0] = 0;
+
+		int config_lines = num_tokens(ld->netconf, '\n');
+		for (int i=0; i<config_lines; ++i) {
+			extract_token(buf, ld->netconf, i, '\n', sizeof buf);
+			if (!strncasecmp(buf, "listrecp|", 9)) {
+				if (recipients[0] != 0) {
+					strcat(recipients, ",");
+				}
+				strcat(recipients, &buf[9]);
+			}
+			if (!strncasecmp(buf, "digestrecp|", 11)) {
+				if (recipients[0] != 0) {
+					strcat(recipients, ",");
+				}
+				strcat(recipients, &buf[11]);
+			}
+		}
+		syslog(LOG_DEBUG, "\033[33m%s\033[0m", recipients);
+		struct recptypes *valid = validate_recipients(recipients, NULL, 0);
+		if (valid) {
+			long new_msgnum = CtdlSubmitMsg(TheMessage, valid, "");
+			free_recipients(valid);
 		}
 	}
 	CM_Free(TheMessage);
@@ -110,7 +133,15 @@ void listdeliver_sweep_room(struct ctdlroom *qrbuf, void *data) {
 	
 		if (number_of_messages_processed > 0) {
 			syslog(LOG_DEBUG, "listdeliver: new lastsent is %ld", ld.msgnum);
+
 			// FIXME write lastsent back to netconfig
+			syslog(LOG_DEBUG, "\033[31mBEFORE:<%s>\033[0m", netconfig);
+			syslog(LOG_DEBUG, "\033[32mAFTER:<%s>\033[0m", netconfig);
+
+
+
+
+
 		}
 	}