* Cleaned up the output of digest mode. It's usable now, but the self-service

  subscribe/unsubscribe functions are not there yet.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index aa8cd95960e8ad43652aa09b6392eaf09aee8add..c36a520164d3eba58ead7c99900c0e076bb30356 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 591.80  2002/08/06 02:58:01  ajc
+ * Cleaned up the output of digest mode.  It's usable now, but the self-service
+   subscribe/unsubscribe functions are not there yet.
+
  Revision 591.79  2002/08/05 14:38:11  ajc
  * rooms.c: corrected a typo reported by Campagnolo (Mike Poulin)
 
@@ -3858,4 +3862,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 00b044d09e9c2036a8f86be0094a1a19f409c3ab..f40c79829a140c2d305bfcf2e7cfa9f2855bbe97 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -459,9 +459,9 @@ void network_spool_msg(long msgnum, void *userdata) {
        if ((sc->digestrecps != NULL) && (sc->digestfp != NULL)) {
                fprintf(sc->digestfp,   " -----------------------------------"
                                        "------------------------------------"
-                                       "-------\r\n");
+                                       "-------\n");
                CtdlRedirectOutput(sc->digestfp, -1);
-               CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
+               CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 0);
                CtdlRedirectOutput(NULL, -1);
                sc->num_msgs_spooled += 1;
        }
@@ -595,7 +595,8 @@ void network_deliver_digest(struct SpoolControl *sc) {
 
        sprintf(buf, "%ld", time(NULL));
        msg->cm_fields['T'] = strdoop(buf);
-
+       msg->cm_fields['A'] = strdoop(CC->quickroom.QRname);
+       msg->cm_fields['U'] = strdoop(CC->quickroom.QRname);
        sprintf(buf, "room_%s@%s", CC->quickroom.QRname, config.c_fqdn);
        for (i=0; i<strlen(buf); ++i) {
                if (isspace(buf[i])) buf[i]='_';
@@ -603,8 +604,6 @@ void network_deliver_digest(struct SpoolControl *sc) {
        }
        msg->cm_fields['F'] = strdoop(buf);
 
-       msg->cm_fields['A'] = strdoop(CC->quickroom.QRname);
-
        fseek(sc->digestfp, 0L, SEEK_END);
        msglen = ftell(sc->digestfp);
 
@@ -733,7 +732,7 @@ void network_spoolout_room(char *room_to_spool) {
        /* If there are digest recipients, we have to build a digest */
        if (sc.digestrecps != NULL) {
                sc.digestfp = tmpfile();
-               fprintf(sc.digestfp, "Content-type: text/plain\r\n\r\n");
+               fprintf(sc.digestfp, "Content-type: text/plain\n\n");
        }
 
        /* Do something useful */
@@ -744,10 +743,9 @@ void network_spoolout_room(char *room_to_spool) {
        if (sc.digestfp != NULL) {
                fprintf(sc.digestfp,    " -----------------------------------"
                                        "------------------------------------"
-                                       "-------\r\n"
+                                       "-------\n"
                                        "You are subscribed to the '%s' "
-                                       "list.\r\nTo unsubscribe, blah blah "
-                                       "blah FIXME.\r\n",
+                                       "list.\n",
                                        CC->quickroom.QRname
                );
                network_deliver_digest(&sc);    /* deliver and close */