Still waiting...

[citadel.git] / citadel / server / modules / inetcfg / serv_inetcfg.c

diff --git a/citadel/server/modules/inetcfg/serv_inetcfg.c b/citadel/server/modules/inetcfg/serv_inetcfg.c
index ee763a920bc15cceb4260110fd071e55aa81a9ad..19e5fd9f4eff5be15ec26db09dd32a8d5d9d40cd 100644 (file)
--- a/citadel/server/modules/inetcfg/serv_inetcfg.c
+++ b/citadel/server/modules/inetcfg/serv_inetcfg.c
@@ -1,19 +1,12 @@
-/*
- * This module handles the loading/saving and maintenance of the
- * system's Internet configuration.  It's not an optional component; I
- * wrote it as a module merely to keep things as clean and loosely coupled
- * as possible.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// This module handles the loading/saving and maintenance of the
+// system's Internet configuration.  It's not an optional component; I
+// wrote it as a module merely to keep things as clean and loosely coupled
+// as possible.
+//
+// Copyright (c) 1987-2024 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License version 3.
 
 #include "../../sysdep.h"
 #include <stdlib.h>
@@ -29,7 +22,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"
@@ -47,8 +40,8 @@ void inetcfg_setTo(struct CtdlMessage *msg) {
        char *conf;
        char buf[SIZ];
        
-       if (CM_IsEmpty(msg, eMesageText)) return;
-       conf = strdup(msg->cm_fields[eMesageText]);
+       if (CM_IsEmpty(msg, eMessageText)) return;
+       conf = strdup(msg->cm_fields[eMessageText]);
 
        if (conf != NULL) {
                do {
@@ -62,17 +55,12 @@ void inetcfg_setTo(struct CtdlMessage *msg) {
 }
 
 
-/*
- * This handler detects changes being made to the system's Internet
- * configuration.
- */
+// This handler detects changes being made to the system's Internet configuration.
 int inetcfg_aftersave(struct CtdlMessage *msg, struct recptypes *recp) {
        char *ptr;
        int linelen;
 
-       /* If this isn't the configuration room, or if this isn't a MIME
-        * message, don't bother.
-        */
+       // If this isn't the configuration room, or if this isn't a MIME message ... don't bother.
        if ((msg->cm_fields[eOriginalRoom]) && (strcasecmp(msg->cm_fields[eOriginalRoom], SYSCONFIGROOM))) {
                return(0);
        }
@@ -80,17 +68,17 @@ int inetcfg_aftersave(struct CtdlMessage *msg, struct recptypes *recp) {
                return(0);
        }
 
-       ptr = msg->cm_fields[eMesageText];
+       ptr = msg->cm_fields[eMessageText];
        while (ptr != NULL) {
        
                linelen = strcspn(ptr, "\n");
                if (linelen == 0) {
-                       return(0);      /* end of headers */    
+                       return(0);                      // end of headers
                }
                
                if (!strncasecmp(ptr, "Content-type: ", 14)) {
                        if (!strncasecmp(&ptr[14], INTERNETCFG, strlen(INTERNETCFG))) {
-                               inetcfg_setTo(msg);     /* changing configs */
+                               inetcfg_setTo(msg);     // changing configs
                        }
                }
 
@@ -106,6 +94,7 @@ void inetcfg_init_backend(long msgnum, void *userdata) {
        struct CtdlMessage *msg;
 
                msg = CtdlFetchMessage(msgnum, 1);
+       syslog(LOG_DEBUG, "inetcfg: config msg %ld is %s", msgnum, msg ? "not null" : "null");
                if (msg != NULL) {
                inetcfg_setTo(msg);
                        CM_Free(msg);
@@ -114,25 +103,23 @@ void inetcfg_init_backend(long msgnum, void *userdata) {
 
 
 void inetcfg_init(void) {
-       syslog(LOG_DEBUG, "EVQ: called inetcfg_init()");
+       syslog(LOG_DEBUG, "inetcfg: inetcfg_init() started");
        if (CtdlGetRoom(&CC->room, SYSCONFIGROOM) != 0) {
+               syslog(LOG_WARNING, "inetcfg: could not find <%s>", SYSCONFIGROOM);
                return;
        }
        CtdlForEachMessage(MSGS_LAST, 1, NULL, INTERNETCFG, NULL, inetcfg_init_backend, NULL);
+       syslog(LOG_DEBUG, "inetcfg: inetcfg_init() completed");
 }
 
 
-/*****************************************************************************/
-/*                      MODULE INITIALIZATION STUFF                          */
-/*****************************************************************************/
-
-
+// Initialization function, called from modules_init.c
 char *ctdl_module_init_inetcfg(void) {
        if (!threading) {
                CtdlRegisterMessageHook(inetcfg_aftersave, EVT_AFTERSAVE);
                inetcfg_init();
        }
        
-       /* return our module name for the log */
+       // return our module name for the log
        return "inetcfg";
 }