MSGS command can now do full text search on the room

[citadel.git] / citadel / serv_inetcfg.c

diff --git a/citadel/serv_inetcfg.c b/citadel/serv_inetcfg.c
index 99ad26586869b6b7a43a707ae2aa7aaa253c7910..5d49d5fa8951c645e2a412ff49debf74457fa390 100644 (file)
--- a/citadel/serv_inetcfg.c
+++ b/citadel/serv_inetcfg.c
@@ -38,7 +38,7 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
@@ -49,25 +49,61 @@
 #include "genstamp.h"
 #include "domain.h"
 
+
+
+
 void inetcfg_setTo(struct CtdlMessage *msg) {
        char *conf;
        char buf[SIZ];
-
+       
        if (msg->cm_fields['M']==NULL) return;
-       conf = strdoop(msg->cm_fields['M']);
+       conf = strdup(msg->cm_fields['M']);
 
        if (conf != NULL) {
                do {
-                       extract_token(buf, conf, 0, '\n');
+                       extract_token(buf, conf, 0, '\n', sizeof buf);
                        strcpy(conf, &conf[strlen(buf)+1]);
                } while ( (strlen(conf)>0) && (strlen(buf)>0) );
 
-               if (inetcfg != NULL) phree(inetcfg);
+               if (inetcfg != NULL) free(inetcfg);
                inetcfg = conf;
        }
 }
 
 
+#ifdef ___NOT_CURRENTLY_IN_USE___
+void spamstrings_setTo(struct CtdlMessage *msg) {
+       char buf[SIZ];
+       char *conf;
+       struct spamstrings_t *sptr;
+       int i, n;
+
+       /* Clear out the existing list */
+       while (spamstrings != NULL) {
+               sptr = spamstrings;
+               spamstrings = spamstrings->next;
+               free(sptr->string);
+               free(sptr);
+       }
+
+       /* Read in the new list */
+       if (msg->cm_fields['M']==NULL) return;
+       conf = strdup(msg->cm_fields['M']);
+       if (conf == NULL) return;
+
+       n = num_tokens(conf, '\n');
+       for (i=0; i<n; ++i) {
+               extract_token(buf, conf, i, '\n', sizeof buf);
+               sptr = malloc(sizeof(struct spamstrings_t));
+               sptr->string = strdup(buf);
+               sptr->next = spamstrings;
+               spamstrings = sptr;
+       }
+
+}
+#endif
+
+
 /*
  * This handler detects changes being made to the system's Internet
  * configuration.
@@ -88,12 +124,11 @@ int inetcfg_aftersave(struct CtdlMessage *msg) {
                linelen = strcspn(ptr, "\n");
                if (linelen == 0) return(0);    /* end of headers */    
                
-               if ( (!strncasecmp(ptr, "Content-type: ", 14))
-                  && (!strncasecmp(&ptr[14], INTERNETCFG,
-                  strlen(INTERNETCFG) )) ) {
-                       /* Bingo!  The user is changing configs.
-                        */
-                       inetcfg_setTo(msg);
+               if (!strncasecmp(ptr, "Content-type: ", 14)) {
+                       if (!strncasecmp(&ptr[14], INTERNETCFG,
+                          strlen(INTERNETCFG))) {
+                               inetcfg_setTo(msg);     /* changing configs */
+                       }
                }
 
                ptr = strchr((char *)ptr, '\n');
@@ -107,7 +142,7 @@ int inetcfg_aftersave(struct CtdlMessage *msg) {
 void inetcfg_init_backend(long msgnum, void *userdata) {
        struct CtdlMessage *msg;
 
-               msg = CtdlFetchMessage(msgnum);
+               msg = CtdlFetchMessage(msgnum, 1);
                if (msg != NULL) {
                inetcfg_setTo(msg);
                        CtdlFreeMessage(msg);
@@ -115,9 +150,22 @@ void inetcfg_init_backend(long msgnum, void *userdata) {
 }
 
 
+#ifdef ___NOT_CURRENTLY_IN_USE___
+void spamstrings_init_backend(long msgnum, void *userdata) {
+       struct CtdlMessage *msg;
+
+               msg = CtdlFetchMessage(msgnum, 1);
+               if (msg != NULL) {
+               spamstrings_setTo(msg);
+                       CtdlFreeMessage(msg);
+       }
+}
+#endif
+
+
 void inetcfg_init(void) {
-       if (getroom(&CC->quickroom, SYSCONFIGROOM) != 0) return;
-       CtdlForEachMessage(MSGS_LAST, 1, INTERNETCFG, NULL,
+       if (getroom(&CC->room, SYSCONFIGROOM) != 0) return;
+       CtdlForEachMessage(MSGS_LAST, 1, NULL, INTERNETCFG, NULL,
                inetcfg_init_backend, NULL);
 }
 
@@ -129,7 +177,7 @@ void inetcfg_init(void) {
 /*****************************************************************************/
 
 
-char *Dynamic_Module_Init(void)
+char *serv_inetcfg_init(void)
 {
        CtdlRegisterMessageHook(inetcfg_aftersave, EVT_AFTERSAVE);
        inetcfg_init();