]> code.citadel.org Git - citadel.git/blobdiff - citadel/msgbase.c
* Replication checks and EUID indexing are now only enabled for rooms whose
[citadel.git] / citadel / msgbase.c
index e20faa973f387cc655e93160bc543beb6dbb9a38..8e5718eaf0ea176ebd91e65331579c4160aeef80 100644 (file)
 #include "internet_addressing.h"
 #include "serv_fulltext.h"
 #include "vcard.h"
+#include "euidindex.h"
 
 long config_msgnum;
-
+struct addresses_to_be_filed *atbf = NULL;
 
 /* 
  * This really belongs in serv_network.c, but I don't know how to export
@@ -347,10 +348,11 @@ void CtdlGetSeen(char *buf, int which_set) {
 /*
  * Manipulate the "seen msgs" string (or other message set strings)
  */
-void CtdlSetSeen(long target_msgnum, int target_setting, int which_set,
+void CtdlSetSeen(long *target_msgnums, int num_target_msgnums,
+               int target_setting, int which_set,
                struct ctdluser *which_user, struct ctdlroom *which_room) {
        struct cdbdata *cdbfr;
-       int i, j;
+       int i, j, k;
        int is_seen = 0;
        int was_seen = 0;
        long lo = (-1L);
@@ -367,8 +369,9 @@ void CtdlSetSeen(long target_msgnum, int target_setting, int which_set,
        char setstr[SIZ], lostr[SIZ], histr[SIZ];
        size_t tmp;
 
-       lprintf(CTDL_DEBUG, "CtdlSetSeen(%ld, %d, %d)\n",
-               target_msgnum, target_setting, which_set);
+       lprintf(CTDL_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %d, %d)\n",
+               num_target_msgnums, target_msgnums[0],
+               target_setting, which_set);
 
        /* Learn about the user and room in question */
        CtdlGetRelationship(&vbuf,
@@ -433,13 +436,13 @@ void CtdlSetSeen(long target_msgnum, int target_setting, int which_set,
        hi = (-1L);
 
        for (i=0; i<num_msgs; ++i) {
-               is_seen = 0;
 
-               if (msglist[i] == target_msgnum) {
-                       is_seen = target_setting;
-               }
-               else {
-                       is_seen = is_set[i];
+               is_seen = is_set[i];    /* Default to existing setting */
+
+               for (k=0; k<num_target_msgnums; ++k) {
+                       if (msglist[i] == target_msgnums[k]) {
+                               is_seen = target_setting;
+                       }
                }
 
                if (is_seen) {
@@ -846,9 +849,13 @@ void list_this_part(char *name, char *filename, char *partnum, char *disp,
                    void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
                    void *cbuserdata)
 {
-
-       cprintf("part=%s|%s|%s|%s|%s|%ld\n",
-               name, filename, partnum, disp, cbtype, (long)length);
+       struct ma_info *ma;
+       
+       ma = (struct ma_info *)cbuserdata;
+       if (ma->is_ma == 0) {
+               cprintf("part=%s|%s|%s|%s|%s|%ld\n",
+                       name, filename, partnum, disp, cbtype, (long)length);
+       }
 }
 
 /* 
@@ -858,7 +865,16 @@ void list_this_pref(char *name, char *filename, char *partnum, char *disp,
                    void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
                    void *cbuserdata)
 {
-       cprintf("pref=%s|%s\n", partnum, cbtype);
+       struct ma_info *ma;
+       
+       ma = (struct ma_info *)cbuserdata;
+       if (!strcasecmp(cbtype, "multipart/alternative")) {
+               ++ma->is_ma;
+       }
+
+       if (ma->is_ma == 0) {
+               cprintf("pref=%s|%s\n", partnum, cbtype);
+       }
 }
 
 /* 
@@ -868,7 +884,15 @@ void list_this_suff(char *name, char *filename, char *partnum, char *disp,
                    void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
                    void *cbuserdata)
 {
-       cprintf("suff=%s|%s\n", partnum, cbtype);
+       struct ma_info *ma;
+       
+       ma = (struct ma_info *)cbuserdata;
+       if (ma->is_ma == 0) {
+               cprintf("suff=%s|%s\n", partnum, cbtype);
+       }
+       if (!strcasecmp(cbtype, "multipart/alternative")) {
+               --ma->is_ma;
+       }
 }
 
 
@@ -1243,7 +1267,7 @@ int CtdlOutputMsg(long msg_num,           /* message number (local) to fetch */
        }
        
        retcode = CtdlOutputPreLoadedMsg(
-                       TheMessage, msg_num, mode,
+                       TheMessage, mode,
                        headers_only, do_proto, crlf);
 
        CtdlFreeMessage(TheMessage);
@@ -1258,7 +1282,6 @@ int CtdlOutputMsg(long msg_num,           /* message number (local) to fetch */
  */
 int CtdlOutputPreLoadedMsg(
                struct CtdlMessage *TheMessage,
-               long msg_num,
                int mode,               /* how would you like that message? */
                int headers_only,       /* eschew the message body? */
                int do_proto,           /* do Citadel protocol responses? */
@@ -1273,7 +1296,7 @@ int CtdlOutputPreLoadedMsg(
        char *nl;       /* newline string */
        int suppress_f = 0;
        int subject_found = 0;
-       struct ma_info *ma;
+       struct ma_info ma;
 
        /* Buffers needed for RFC822 translation.  These are all filled
         * using functions that are bounds-checked, and therefore we can
@@ -1287,12 +1310,11 @@ int CtdlOutputPreLoadedMsg(
        char mid[100];
        char datestamp[100];
 
-       lprintf(CTDL_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %ld, %d, %d, %d, %d\n",
+       lprintf(CTDL_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n",
                ((TheMessage == NULL) ? "NULL" : "not null"),
-               msg_num,
                mode, headers_only, do_proto, crlf);
 
-       snprintf(mid, sizeof mid, "%ld", msg_num);
+       strcpy(mid, "unknown");
        nl = (crlf ? "\r\n" : "\n");
 
        if (!is_valid_message(TheMessage)) {
@@ -1314,10 +1336,7 @@ int CtdlOutputPreLoadedMsg(
                } else {
                        /* Parse the message text component */
                        mptr = TheMessage->cm_fields['M'];
-                       ma = malloc(sizeof(struct ma_info));
-                       memset(ma, 0, sizeof(struct ma_info));
-                       mime_parser(mptr, NULL, *mime_download, NULL, NULL, (void *)ma, 0);
-                       free(ma);
+                       mime_parser(mptr, NULL, *mime_download, NULL, NULL, NULL, 0);
                        /* If there's no file open by this time, the requested
                         * section wasn't found, so print an error
                         */
@@ -1332,7 +1351,7 @@ int CtdlOutputPreLoadedMsg(
        }
 
        /* now for the user-mode message reading loops */
-       if (do_proto) cprintf("%d Message %ld:\n", LISTING_FOLLOWS, msg_num);
+       if (do_proto) cprintf("%d msg:\n", LISTING_FOLLOWS);
 
        /* Does the caller want to skip the headers? */
        if (headers_only == HEADERS_NONE) goto START_TEXT;
@@ -1508,53 +1527,44 @@ START_TEXT:
        /* Tell the client about the MIME parts in this message */
        if (TheMessage->cm_format_type == FMT_RFC822) {
                if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) {
+                       memset(&ma, 0, sizeof(struct ma_info));
                        mime_parser(mptr, NULL,
                                (do_proto ? *list_this_part : NULL),
                                (do_proto ? *list_this_pref : NULL),
                                (do_proto ? *list_this_suff : NULL),
-                               NULL, 0);
+                               (void *)&ma, 0);
                }
                else if (mode == MT_RFC822) {   /* unparsed RFC822 dump */
-                       /* FIXME ... we have to put some code in here to avoid
-                        * printing duplicate header information when both
-                        * Citadel and RFC822 headers exist.  Preference should
-                        * probably be given to the RFC822 headers.
-                        */
-                       int done_rfc822_hdrs = 0;
-                       while (ch=*(mptr++), ch!=0) {
+                       char *start_of_text = NULL;
+                       start_of_text = strstr(mptr, "\n\r\n");
+                       if (start_of_text == NULL) start_of_text = strstr(mptr, "\n\n");
+                       if (start_of_text == NULL) start_of_text = mptr;
+                       ++start_of_text;
+                       start_of_text = strstr(start_of_text, "\n");
+                       ++start_of_text;
+                       while (ch=*mptr, ch!=0) {
                                if (ch==13) {
                                        /* do nothing */
                                }
-                               else if (ch==10) {
-                                       if (!done_rfc822_hdrs) {
-                                               if (headers_only != HEADERS_NONE) {
-                                                       cprintf("%s", nl);
-                                               }
-                                       }
-                                       else {
-                                               if (headers_only != HEADERS_ONLY) {
-                                                       cprintf("%s", nl);
-                                               }
-                                       }
-                                       if ((*(mptr) == 13) || (*(mptr) == 10)) {
-                                               done_rfc822_hdrs = 1;
-                                       }
-                               }
-                               else {
-                                       if (done_rfc822_hdrs) {
-                                               if (headers_only != HEADERS_NONE) {
-                                                       cprintf("%c", ch);
+                               else switch(headers_only) {
+                                       case HEADERS_NONE:
+                                               if (mptr >= start_of_text) {
+                                                       if (ch == 10) cprintf("%s", nl);
+                                                       else cprintf("%c", ch);
                                                }
-                                       }
-                                       else {
-                                               if (headers_only != HEADERS_ONLY) {
-                                                       cprintf("%c", ch);
+                                               break;
+                                       case HEADERS_ONLY:
+                                               if (mptr < start_of_text) {
+                                                       if (ch == 10) cprintf("%s", nl);
+                                                       else cprintf("%c", ch);
                                                }
-                                       }
-                                       if ((*mptr == 13) || (*mptr == 10)) {
-                                               done_rfc822_hdrs = 1;
-                                       }
+                                               break;
+                                       default:
+                                               if (ch == 10) cprintf("%s", nl);
+                                               else cprintf("%c", ch);
+                                               break;
                                }
+                               ++mptr;
                        }
                        goto DONE;
                }
@@ -1613,24 +1623,22 @@ START_TEXT:
         * we use will display those parts as-is.
         */
        if (TheMessage->cm_format_type == FMT_RFC822) {
-               ma = malloc(sizeof(struct ma_info));
-               memset(ma, 0, sizeof(struct ma_info));
+               memset(&ma, 0, sizeof(struct ma_info));
 
                if (mode == MT_MIME) {
-                       strcpy(ma->chosen_part, "1");
+                       strcpy(ma.chosen_part, "1");
                        mime_parser(mptr, NULL,
                                *choose_preferred, *fixed_output_pre,
-                               *fixed_output_post, (void *)ma, 0);
+                               *fixed_output_post, (void *)&ma, 0);
                        mime_parser(mptr, NULL,
-                               *output_preferred, NULL, NULL, (void *)ma, 0);
+                               *output_preferred, NULL, NULL, (void *)&ma, 0);
                }
                else {
                        mime_parser(mptr, NULL,
                                *fixed_output, *fixed_output_pre,
-                               *fixed_output_post, (void *)ma, 0);
+                               *fixed_output_post, (void *)&ma, 0);
                }
 
-               free(ma);
        }
 
 DONE:  /* now we're done */
@@ -1745,7 +1753,8 @@ void cmd_opna(char *cmdbuf)
 
        msgid = extract_long(cmdbuf, 0);
        extract_token(desired_section, cmdbuf, 1, '|', sizeof desired_section);
-       safestrncpy(CC->download_desired_section, desired_section, sizeof CC->download_desired_section);
+       safestrncpy(CC->download_desired_section, desired_section,
+               sizeof CC->download_desired_section);
        CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1);
 }                      
 
@@ -1754,8 +1763,14 @@ void cmd_opna(char *cmdbuf)
  * Save a message pointer into a specified room
  * (Returns 0 for success, nonzero for failure)
  * roomname may be NULL to use the current room
+ *
+ * Note that the 'supplied_msg' field may be set to NULL, in which case
+ * the message will be fetched from disk, by number, if we need to perform
+ * replication checks.  This adds an additional database read, so if the
+ * caller already has the message in memory then it should be supplied.
  */
-int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
+int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int do_repl_check,
+                               struct CtdlMessage *supplied_msg) {
        int i;
        char hold_rm[ROOMNAMELEN];
        struct cdbdata *cdbfr;
@@ -1764,37 +1779,36 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
        long highest_msg = 0L;
        struct CtdlMessage *msg = NULL;
 
-       lprintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom(%s, %ld, %d)\n",
-               roomname, msgid, flags);
+       /*lprintf(CTDL_DEBUG,
+               "CtdlSaveMsgPointerInRoom(room=%s, msgid=%ld, repl=%d)\n",
+               roomname, msgid, do_repl_check);*/
 
        strcpy(hold_rm, CC->room.QRname);
 
        /* We may need to check to see if this message is real */
-       if (  (flags & SM_VERIFY_GOODNESS)
-          || (flags & SM_DO_REPL_CHECK)
-          ) {
-               msg = CtdlFetchMessage(msgid, 1);
+       if (do_repl_check) {
+               if (supplied_msg != NULL) {
+                       msg = supplied_msg;
+               }
+               else {
+                       msg = CtdlFetchMessage(msgid, 0);
+               }
                if (msg == NULL) return(ERROR + ILLEGAL_VALUE);
        }
 
        /* Perform replication checks if necessary */
-       if ( (flags & SM_DO_REPL_CHECK) && (msg != NULL) ) {
-
+       if ( (do_repl_check) && (msg != NULL) ) {
                if (getroom(&CC->room,
                   ((roomname != NULL) ? roomname : CC->room.QRname) )
                   != 0) {
                        lprintf(CTDL_ERR, "No such room <%s>\n", roomname);
-                       if (msg != NULL) CtdlFreeMessage(msg);
+                       if ( (msg != NULL) && (msg != supplied_msg) ) {
+                               CtdlFreeMessage(msg);
+                       }
                        return(ERROR + ROOM_NOT_FOUND);
                }
 
-               if (ReplicationChecks(msg) != 0) {
-                       getroom(&CC->room, hold_rm);
-                       if (msg != NULL) CtdlFreeMessage(msg);
-                       lprintf(CTDL_DEBUG,
-                               "Did replication, and newer exists\n");
-                       return(0);
-               }
+               ReplicationChecks(msg);
        }
 
        /* Now the regular stuff */
@@ -1802,7 +1816,9 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
           ((roomname != NULL) ? roomname : CC->room.QRname) )
           != 0) {
                lprintf(CTDL_ERR, "No such room <%s>\n", roomname);
-               if (msg != NULL) CtdlFreeMessage(msg);
+               if ( (msg != NULL) && (msg != supplied_msg) ) {
+                       CtdlFreeMessage(msg);
+               }
                return(ERROR + ROOM_NOT_FOUND);
        }
 
@@ -1812,8 +1828,9 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
                num_msgs = 0;
        } else {
                msglist = malloc(cdbfr->len);
-               if (msglist == NULL)
+               if (msglist == NULL) {
                        lprintf(CTDL_ALERT, "ERROR malloc msglist!\n");
+               }
                num_msgs = cdbfr->len / sizeof(long);
                memcpy(msglist, cdbfr->ptr, cdbfr->len);
                cdb_free(cdbfr);
@@ -1828,7 +1845,9 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
                if (msglist[i] == msgid) {
                        lputroom(&CC->room);    /* unlock the room */
                        getroom(&CC->room, hold_rm);
-                       if (msg != NULL) CtdlFreeMessage(msg);
+                       if ( (msg != NULL) && (msg != supplied_msg) ) {
+                               CtdlFreeMessage(msg);
+                       }
                        free(msglist);
                        return(ERROR + ALREADY_EXISTS);
                }
@@ -1856,18 +1875,26 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
        /* Free up the memory we used. */
        free(msglist);
 
+       /* If the message has an Exclusive ID, index that... */
+       if (msg != NULL) {
+               if (msg->cm_fields['E'] != NULL) {
+                       index_message_by_euid(msg->cm_fields['E'],
+                                               &CC->room, msgid);
+               }
+       }
+
        /* Update the highest-message pointer and unlock the room. */
        CC->room.QRhighest = highest_msg;
        lputroom(&CC->room);
        getroom(&CC->room, hold_rm);
 
        /* Bump the reference count for this message. */
-       if ((flags & SM_DONT_BUMP_REF)==0) {
-               AdjRefCount(msgid, +1);
-       }
+       AdjRefCount(msgid, +1);
 
        /* Return success. */
-       if (msg != NULL) CtdlFreeMessage(msg);
+       if ( (msg != NULL) && (msg != supplied_msg) ) {
+               CtdlFreeMessage(msg);
+       }
        return (0);
 }
 
@@ -1995,61 +2022,33 @@ void serialize_message(struct ser_ret *ret,             /* return values */
 
 
 /*
- * Back end for the ReplicationChecks() function
+ * Check to see if any messages already exist in the current room which
+ * carry the same Exclusive ID as this one.  If any are found, delete them.
  */
-void check_repl(long msgnum, void *userdata) {
-       lprintf(CTDL_DEBUG, "check_repl() replacing message %ld\n", msgnum);
-       CtdlDeleteMessages(CC->room.QRname, msgnum, "", 0);
-}
+void ReplicationChecks(struct CtdlMessage *msg) {
+       long old_msgnum = (-1L);
 
+       if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return;
 
-/*
- * Check to see if any messages already exist which carry the same Exclusive ID
- * as this one.  If any are found, delete them.
- *
- */
-int ReplicationChecks(struct CtdlMessage *msg) {
-       struct CtdlMessage *template;
-       int abort_this = 0;
+       lprintf(CTDL_DEBUG, "Performing replication checks in <%s>\n",
+               CC->room.QRname);
 
        /* No exclusive id?  Don't do anything. */
-       if (msg->cm_fields['E'] == NULL) return 0;
-       if (strlen(msg->cm_fields['E']) == 0) return 0;
-       lprintf(CTDL_DEBUG, "Exclusive ID: <%s>\n", msg->cm_fields['E']);
-
-       template = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
-       memset(template, 0, sizeof(struct CtdlMessage));
-       template->cm_fields['E'] = strdup(msg->cm_fields['E']);
+       if (msg == NULL) return;
+       if (msg->cm_fields['E'] == NULL) return;
+       if (strlen(msg->cm_fields['E']) == 0) return;
+       /*lprintf(CTDL_DEBUG, "Exclusive ID: <%s> for room <%s>\n",
+               msg->cm_fields['E'], CC->room.QRname);*/
 
-       CtdlForEachMessage(MSGS_ALL, 0L, NULL, template, check_repl, NULL);
-
-       CtdlFreeMessage(template);
-       lprintf(CTDL_DEBUG, "ReplicationChecks() returning %d\n", abort_this);
-       return(abort_this);
+       old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CC->room);
+       if (old_msgnum > 0L) {
+               lprintf(CTDL_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum);
+               CtdlDeleteMessages(CC->room.QRname, old_msgnum, "", 0);
+       }
 }
 
 
 
-/* 
- * Turn an arbitrary RFC822 address into a struct vCard for possible
- * inclusion into an address book.
- */
-struct vCard *vcard_new_from_rfc822_addr(char *addr) {
-       struct vCard *v;
-       char user[256], node[256], name[256], email[256];
-
-       v = vcard_new();
-       if (v == NULL) return(NULL);
-
-       process_rfc822_addr(addr, user, node, name);
-       vcard_set_prop(v, "fn", name, 0);
-       snprintf(email, sizeof email, "%s@%s", user, node);
-       vcard_set_prop(v, "email;internet", email, 0);
-
-       return(v);
-}
-
-
 /*
  * Save a message to disk and submit it into the delivery system.
  */
@@ -2072,13 +2071,11 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,     /* message to save */
        FILE *network_fp = NULL;
        static int seqnum = 1;
        struct CtdlMessage *imsg = NULL;
-       struct CtdlMessage *vmsg = NULL;
-       char *ser = NULL;
-       struct vCard *v = NULL;
        char *instr;
        struct ser_ret smr;
        char *hold_R, *hold_D;
        char *collected_addresses = NULL;
+       struct addresses_to_be_filed *aptr = NULL;
 
        lprintf(CTDL_DEBUG, "CtdlSubmitMsg() called\n");
        if (is_valid_message(msg) == 0) return(-1);     /* self check */
@@ -2087,7 +2084,6 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
         * giving it one, right now.
         */
        if (msg->cm_fields['T'] == NULL) {
-               lprintf(CTDL_DEBUG, "Generating timestamp\n");
                snprintf(generated_timestamp, sizeof generated_timestamp, "%ld", (long)time(NULL));
                msg->cm_fields['T'] = strdup(generated_timestamp);
        }
@@ -2095,7 +2091,6 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        /* If this message has no path, we generate one.
         */
        if (msg->cm_fields['P'] == NULL) {
-               lprintf(CTDL_DEBUG, "Generating path\n");
                if (msg->cm_fields['A'] != NULL) {
                        msg->cm_fields['P'] = strdup(msg->cm_fields['A']);
                        for (a=0; a<strlen(msg->cm_fields['P']); ++a) {
@@ -2117,7 +2112,6 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        }
 
        /* Learn about what's inside, because it's what's inside that counts */
-       lprintf(CTDL_DEBUG, "Learning what's inside\n");
        if (msg->cm_fields['M'] == NULL) {
                lprintf(CTDL_ERR, "ERROR: attempt to save message with NULL body\n");
                return(-2);
@@ -2148,8 +2142,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        }
 
        /* Goto the correct room */
-       lprintf(CTDL_DEBUG, "Selected room %s\n",
-               (recps) ? CC->room.QRname : SENTITEMS);
+       lprintf(CTDL_DEBUG, "Selected room %s\n", (recps) ? CC->room.QRname : SENTITEMS);
        strcpy(hold_rm, CC->room.QRname);
        strcpy(actual_rm, CC->room.QRname);
        if (recps != NULL) {
@@ -2157,12 +2150,11 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,     /* message to save */
        }
 
        /* If the user is a twit, move to the twit room for posting */
-       lprintf(CTDL_DEBUG, "Handling twit stuff: %s\n",
-                       (CC->user.axlevel == 2) ? config.c_twitroom : "OK");
        if (TWITDETECT) {
                if (CC->user.axlevel == 2) {
                        strcpy(hold_rm, actual_rm);
                        strcpy(actual_rm, config.c_twitroom);
+                       lprintf(CTDL_DEBUG, "Diverting to twit room\n");
                }
        }
 
@@ -2188,9 +2180,13 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,      /* message to save */
        lprintf(CTDL_DEBUG, "Performing before-save hooks\n");
        if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-3);
 
-       /* If this message has an Exclusive ID, perform replication checks */
-       lprintf(CTDL_DEBUG, "Performing replication checks\n");
-       if (ReplicationChecks(msg) > 0) return(-4);
+       /*
+        * If this message has an Exclusive ID, and the room is replication
+        * checking enabled, then do replication checks.
+        */
+       if (DoesThisRoomNeedEuidIndexing(&CC->room)) {
+               ReplicationChecks(msg);
+       }
 
        /* Save it to disk */
        lprintf(CTDL_DEBUG, "Saving to disk\n");
@@ -2222,7 +2218,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        CC->redirect_buffer = malloc(SIZ);
        CC->redirect_len = 0;
        CC->redirect_alloc = SIZ;
-       CtdlOutputPreLoadedMsg(msg, 0L, MT_RFC822, HEADERS_ALL, 0, 1);
+       CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1);
        smi.meta_rfc822_length = CC->redirect_len;
        free(CC->redirect_buffer);
        CC->redirect_buffer = NULL;
@@ -2239,17 +2235,16 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,     /* message to save */
         * is no local sender; it would otherwise go to the Trashcan).
         */
        if ((!CC->internal_pgm) || (recps == NULL)) {
-               if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0) != 0) {
+               if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) {
                        lprintf(CTDL_ERR, "ERROR saving message pointer!\n");
-                       CtdlSaveMsgPointerInRoom(config.c_aideroom,
-                                                       newmsgid, 0);
+                       CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
                }
        }
 
        /* For internet mail, drop a copy in the outbound queue room */
        if (recps != NULL)
         if (recps->num_internet > 0) {
-               CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0);
+               CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0, msg);
        }
 
        /* If other rooms are specified, drop them there too. */
@@ -2259,7 +2254,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
                extract_token(recipient, recps->recp_room, i,
                                        '|', sizeof recipient);
                lprintf(CTDL_DEBUG, "Delivering to room <%s>\n", recipient);
-               CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0);
+               CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg);
        }
 
        /* Bump this user's messages posted counter. */
@@ -2281,13 +2276,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,     /* message to save */
                if (getuser(&userbuf, recipient) == 0) {
                        MailboxName(actual_rm, sizeof actual_rm,
                                        &userbuf, MAILROOM);
-                       CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
+                       CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg);
                        BumpNewMailCounter(userbuf.usernum);
                }
                else {
                        lprintf(CTDL_DEBUG, "No user <%s>\n", recipient);
-                       CtdlSaveMsgPointerInRoom(config.c_aideroom,
-                                                       newmsgid, 0);
+                       CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
                }
        }
 
@@ -2382,42 +2376,20 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,     /* message to save */
 
        /*
         * Any addresses to harvest for someone's address book?
-        * (Don't do this if this is not a message with recipients, otherwise we will
-        * send this function into infinite recursion!!!!!)
         */
-       if (recps != NULL) {
+       if ( (CC->logged_in) && (recps != NULL) ) {
                collected_addresses = harvest_collected_addresses(msg);
        }
 
        if (collected_addresses != NULL) {
-               for (i=0; i<num_tokens(collected_addresses, ','); ++i) {
-
-                       /* Make a vCard out of each address */
-                       extract_token(recipient, collected_addresses, i, ',', sizeof recipient);
-                       striplt(recipient);
-                       v = vcard_new_from_rfc822_addr(recipient);
-                       if (v != NULL) {
-                               vmsg = malloc(sizeof(struct CtdlMessage));
-                               memset(vmsg, 0, sizeof(struct CtdlMessage));
-                               vmsg->cm_magic = CTDLMESSAGE_MAGIC;
-                               vmsg->cm_anon_type = MES_NORMAL;
-                               vmsg->cm_format_type = FMT_RFC822;
-                               vmsg->cm_fields['A'] = strdup("Citadel");
-                               vmsg->cm_fields['E'] = strdup(recipient);       /* this handles dups */
-                               ser = vcard_serialize(v);
-                               if (ser != NULL) {
-                                       vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024);
-                                       sprintf(vmsg->cm_fields['M'],
-                                               "Content-type: text/x-vcard"
-                                               "\r\n\r\n%s\r\n", ser);
-                                       free(ser);
-                               }
-                               vcard_free(v);
-                               CtdlSubmitMsg(vmsg, NULL, "Aide");      /* FIXME */
-                               CtdlFreeMessage(vmsg);
-                       }
-               }
-               free(collected_addresses);
+               begin_critical_section(S_ATBF);
+               aptr = (struct addresses_to_be_filed *) malloc(sizeof(struct addresses_to_be_filed));
+               aptr->next = atbf;
+               MailboxName(actual_rm, sizeof actual_rm, &CC->user, USERCONTACTSROOM);
+               aptr->roomname = strdup(actual_rm);
+               aptr->collected_addresses = collected_addresses;
+               atbf = aptr;
+               end_critical_section(S_ATBF);
        }
        return(newmsgid);
 }
@@ -3284,8 +3256,7 @@ void cmd_dele(char *delstr)
 int CtdlCopyMsgToRoom(long msgnum, char *dest) {
        int err;
 
-       err = CtdlSaveMsgPointerInRoom(dest, msgnum,
-               (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
+       err = CtdlSaveMsgPointerInRoom(dest, msgnum, 1, NULL);
        if (err != 0) return(err);
 
        return(0);