Modularise msgbase

[citadel.git] / citadel / modules / network / serv_netmail.c

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index 2782fbf8f23bf60a4b8a08fe98534b5fe362cac7..10d957e710a1495b0a9c6c6996d431b2c4eeb2fb 100644 (file)
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -185,12 +185,6 @@ void network_deliver_digest(SpoolControl *sc)
        if (sc->Users[digestrecp] == NULL)
                return;
 
-       if (sc->num_msgs_spooled < 1) {
-               fclose(sc->digestfp);
-               sc->digestfp = NULL;
-               return;
-       }
-
        msg = malloc(sizeof(struct CtdlMessage));
        memset(msg, 0, sizeof(struct CtdlMessage));
        msg->cm_magic = CTDLMESSAGE_MAGIC;
@@ -221,11 +215,9 @@ void network_deliver_digest(SpoolControl *sc)
        CM_SetAsField(msg, eMesageText, &pbuf, msglen);
 
        /* Now generate the delivery instructions */
-       if (sc->Users[digestrecp] == NULL)
-               return;
 
        /* Where do we want bounces and other noise to be heard?
-        *Surely not the list members! */
+        * Surely not the list members! */
        snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
 
        /* Now submit the message */
@@ -245,15 +237,27 @@ void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *de
 
        struct CtdlMessage *msg = NULL;
 
-       /*
-        * Process digest recipients
-        */
-       if ((sc->Users[digestrecp] == NULL)||
-           (sc->digestfp == NULL))
+       if (sc->Users[digestrecp] == NULL)
                return;
 
+       /* If there are digest recipients, we have to build a digest */
+       if (sc->digestfp == NULL) {
+               
+               sc->digestfp = create_digest_file(&sc->room, 1);
+
+               if (sc->digestfp == NULL)
+                       return;
+
+               sc->haveDigest = ftell(sc->digestfp) > 0;
+               if (!sc->haveDigest) {
+                       fprintf(sc->digestfp, "Content-type: text/plain\n\n");
+               }
+               sc->haveDigest = 1;
+       }
+
        msg = CM_Duplicate(omsg);
        if (msg != NULL) {
+               sc->haveDigest = 1;
                fprintf(sc->digestfp,
                        " -----------------------------------"
                        "------------------------------------"
@@ -591,7 +595,7 @@ void network_spool_msg(long msgnum,
 
        sc = (SpoolControl *)userdata;
 
-       msg = CtdlFetchMessage(msgnum, 1);
+       msg = CtdlFetchMessage(msgnum, 1, 1);
 
        if (msg == NULL)
        {