Found another vestige of ignet to remove

diff --git a/citadel/modules/ctdlproto/serv_messages.c b/citadel/modules/ctdlproto/serv_messages.c
index af40c304b1ae2b341e6bd391f229114a5bbe9888..3d37dcc8122a271544a6f9fbb7596c63e7158006 100644 (file)
--- a/citadel/modules/ctdlproto/serv_messages.c
+++ b/citadel/modules/ctdlproto/serv_messages.c
@@ -1,6 +1,6 @@
 // Message-related protocol commands for Citadel clients
 //
-// Copyright (c) 1987-2021 by the citadel.org team
+// Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 3.
@@ -535,10 +535,8 @@ void cmd_ent0(char *entargs) {
                        }
                }
 
-               if ( ( (valid_to->num_internet + valid_to->num_ignet + valid_cc->num_internet + valid_cc->num_ignet + valid_bcc->num_internet + valid_bcc->num_ignet) > 0)
-                    && (CC->user.axlevel < AxNetU) ) {
-                       cprintf("%d Higher access required for network mail.\n",
-                               ERROR + HIGHER_ACCESS_REQUIRED);
+               if ( ( (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet) > 0) && (CC->user.axlevel < AxNetU) ) {
+                       cprintf("%d Higher access required for network mail.\n", ERROR + HIGHER_ACCESS_REQUIRED);
                        free_recipients(valid_to);
                        free_recipients(valid_cc);
                        free_recipients(valid_bcc);

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 93da0900751910218c1816b5302e6a7143f45807..3acd13b36587982858997f467507db85a8a41df8 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1,6 +1,6 @@
 // Implements the message store.
 //
-// Copyright (c) 1987-2021 by the citadel.org team
+// Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 3.
@@ -2880,7 +2880,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
                if (recps == NULL) {
                        qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs");
                }
-               else if (recps->num_local + recps->num_ignet + recps->num_internet > 0) {
+               else if (recps->num_local + recps->num_internet > 0) {
                        qualified_for_journaling = CtdlGetConfigInt("c_journal_email");
                }
                else {

diff --git a/citadel/server.h b/citadel/server.h
index f0af5c6475d81931721e604755f41c2416c747bd..aa038f47f51d058641c5caff654b290f80dd7535 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -48,7 +48,6 @@ struct recptypes {
        int recptypes_magic;
         int num_local;
         int num_internet;
-        int num_ignet;
        int num_room;
         int num_error;
        char *errormsg;

diff --git a/webcit/messages.c b/webcit/messages.c
index 1024e0657885d03a657cbcc9f6c675214c9d7d4e..d713aaea9a91df089caece3368b43ab49cd8b74d 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -851,10 +851,8 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer) {
 }
 
 
-/*
- * Back end for post_message()
- * ... this is where the actual message gets transmitted to the server.
- */
+// Back end for post_message()
+// This is where the actual message gets transmitted to the server.
 void post_mime_to_server(void) {
        char top_boundary[SIZ];
        char alt_boundary[SIZ];
@@ -903,8 +901,7 @@ void post_mime_to_server(void) {
        /* Remember, serv_printf() appends an extra newline */
        if (include_text_alt) {
                StrBuf *Buf;
-               serv_printf("Content-type: multipart/alternative; "
-                       "boundary=\"%s\"\n", alt_boundary);
+               serv_printf("Content-type: multipart/alternative; boundary=\"%s\"\n", alt_boundary);
                serv_printf("This is a multipart message in MIME format.\n");
                serv_printf("--%s", alt_boundary);
 
@@ -964,10 +961,14 @@ void post_mime_to_server(void) {
                        serv_puts("");
                        free(encoded);
                }
+               syslog(LOG_DEBUG, "\033[33m sending final boundary --%s-- \033[0m", top_boundary);
+               TRACE;
                serv_printf("--%s--", top_boundary);
                DeleteHashPos(&it);
        }
 
+       syslog(LOG_DEBUG, "\033[33m sending terminating 000 \033[0m");
+       TRACE;
        serv_puts("000");
 }