From dd53c9d4d4e92c6a639fce59859023a00744e8b6 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@uncensored.citadel.org>
Date: Tue, 28 Jun 2011 01:17:16 -0400
Subject: [PATCH] Removed the commented-out vestiges of a spam strings checker
 begun before we decided to use spamassassin instead.

---
 citadel/modules/inetcfg/serv_inetcfg.c | 46 --------------------------
 citadel/modules/vcard/serv_vcard.c     |  8 ++---
 citadel/modules/wiki/serv_wiki.c       |  1 +
 3 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/citadel/modules/inetcfg/serv_inetcfg.c b/citadel/modules/inetcfg/serv_inetcfg.c
index 3ac9339c2..6d29311b3 100644
--- a/citadel/modules/inetcfg/serv_inetcfg.c
+++ b/citadel/modules/inetcfg/serv_inetcfg.c
@@ -81,39 +81,6 @@ void inetcfg_setTo(struct CtdlMessage *msg) {
 }
 
 
-#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.
@@ -160,19 +127,6 @@ 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 (CtdlGetRoom(&CC->room, SYSCONFIGROOM) != 0) return;
 	CtdlForEachMessage(MSGS_LAST, 1, NULL, INTERNETCFG, NULL,
diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index 8340d4eeb..7a0df9ae8 100644
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -198,7 +198,7 @@ void cmd_igab(char *argbuf) {
 	CtdlDirectoryInit();
 
 	/* We want *all* vCards in this room */
-	CtdlForEachMessage(MSGS_ALL, 0, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
+	CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
 		NULL, vcard_add_to_directory, NULL);
 
 	CtdlGetRoom(&CC->room, hold_rm);	/* return to saved room */
@@ -393,7 +393,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 		 * vCard in the user's config room at all times.
 		 *
 		 */
-		CtdlDeleteMessages(CC->room.QRname, NULL, 0, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
+		CtdlDeleteMessages(CC->room.QRname, NULL, 0, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
 
 		/* Make the author of the message the name of the user. */
 		if (msg->cm_fields['A'] != NULL) {
@@ -607,7 +607,7 @@ struct vCard *vcard_get_user(struct ctdluser *u) {
 
 	/* We want the last (and probably only) vcard in this room */
 	VCmsgnum = (-1);
-	CtdlForEachMessage(MSGS_LAST, 1, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
+	CtdlForEachMessage(MSGS_LAST, 1, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
 		NULL, vcard_gu_backend, (void *)&VCmsgnum );
 	CtdlGetRoom(&CC->room, hold_rm);	/* return to saved room */
 
@@ -1323,7 +1323,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) {
 
 	/* First remove any addresses we already have in the address book */
 	CtdlUserGoto(aptr->roomname, 0, 0, NULL, NULL);
-	CtdlForEachMessage(MSGS_ALL, 0, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL,
+	CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL,
 		strip_addresses_already_have, aptr->collected_addresses);
 
 	if (!IsEmptyStr(aptr->collected_addresses))
diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index 0399124b3..49a039809 100644
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -239,6 +239,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg) {
 	 */
 	if (history_msg->cm_fields['I'] != NULL) {
 		free(history_msg->cm_fields['I']);
+		history_msg->cm_fields['I'] = NULL;
 	}
 
 	/* Figure out the boundary string.  We do this even when we generated the
-- 
2.30.2