Continue phase 2 of modules stuff.

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index dc0823e58830d825b3988662dc53039b822ebcbc..34e11c15c6d0e715a13144db53c9ddc611dfebcc 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -49,16 +49,11 @@
 #include "html.h"
 #include "genstamp.h"
 #include "internet_addressing.h"
-#include "serv_fulltext.h"
 #include "vcard.h"
 #include "euidindex.h"
 #include "journaling.h"
 #include "citadel_dirs.h"
-#include "serv_network.h"
 
-#ifdef HAVE_LIBSIEVE
-# include "serv_sieve.h"
-#endif /* HAVE_LIBSIEVE */
 
 long config_msgnum;
 struct addresses_to_be_filed *atbf = NULL;
@@ -614,7 +609,13 @@ int CtdlForEachMessage(int mode, long ref, char *search_string,
         * over again.
         */
        if ( (num_msgs > 0) && (mode == MSGS_SEARCH) && (search_string) ) {
-               ft_search(&num_search_msgs, &search_msgs, search_string);
+
+               /* Call search module via hook mechanism.
+                * NULL means use any search function available.
+                * otherwise replace with a char * to name of search routine
+                */
+               CtdlModuleDoSearch(&num_search_msgs, &search_msgs, search_string, "fulltext");
+
                if (num_search_msgs > 0) {
        
                        int orig_num_msgs;
@@ -2143,15 +2144,8 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms
                lprintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom() skips repl checks\n");
        }
 
-       /* Submit this room for net processing */
-       network_queue_room(&CC->room, NULL);
-
-#ifdef HAVE_LIBSIEVE
-       /* If this is someone's inbox, submit the room for sieve processing */
-       if (!strcasecmp(&CC->room.QRname[11], MAILROOM)) {
-               sieve_queue_room(&CC->room);
-       }
-#endif /* HAVE_LIBSIEVE */
+       /* Submit this room for processing by hooks */
+       PerformRoomHooks(&CC->room);
 
        /* Go back to the room we were in before we wandered here... */
        getroom(&CC->room, hold_rm);
@@ -2931,6 +2925,7 @@ struct CtdlMessage *CtdlMakeMessage(
        char dest_node[256];
        char buf[1024];
        struct CtdlMessage *msg;
+       int i;
 
        msg = malloc(sizeof(struct CtdlMessage));
        memset(msg, 0, sizeof(struct CtdlMessage));
@@ -2944,8 +2939,21 @@ struct CtdlMessage *CtdlMakeMessage(
        striplt(recipient);
        striplt(recp_cc);
 
-       snprintf(buf, sizeof buf, "cit%ld", author->usernum);   /* Path */
-       msg->cm_fields['P'] = strdup(buf);
+       /* Path or Return-Path */
+       if (my_email == NULL) my_email = "";
+
+       if (strlen(my_email) > 0) {
+               msg->cm_fields['P'] = strdup(my_email);
+       }
+       else {
+               snprintf(buf, sizeof buf, "%s", author->fullname);
+               msg->cm_fields['P'] = strdup(buf);
+       }
+       for (i=0; (msg->cm_fields['P'][i]!=0); ++i) {
+               if (isspace(msg->cm_fields['P'][i])) {
+                       msg->cm_fields['P'][i] = '_';
+               }
+       }
 
        snprintf(buf, sizeof buf, "%ld", (long)time(NULL));     /* timestamp */
        msg->cm_fields['T'] = strdup(buf);
@@ -3334,6 +3342,7 @@ void cmd_ent0(char *entargs)
        struct recptypes *valid_cc = NULL;
        struct recptypes *valid_bcc = NULL;
        char subject[SIZ];
+       int subject_required = 0;
        int do_confirm = 0;
        long msgnum;
        int i, j;
@@ -3516,14 +3525,22 @@ void cmd_ent0(char *entargs)
                recp[0] = 0;
        }
 
+       /* Recommend to the client that the use of a message subject is
+        * strongly recommended in this room, if either the SUBJECTREQ flag
+        * is set, or if there is one or more Internet email recipients.
+        */
+       if (CC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1;
+       if (valid_to) if (valid_to->num_internet > 0) subject_required = 1;
+       if (valid_cc) if (valid_cc->num_internet > 0) subject_required = 1;
+       if (valid_bcc) if (valid_bcc->num_internet > 0) subject_required = 1;
+
        /* If we're only checking the validity of the request, return
         * success without creating the message.
         */
        if (post == 0) {
-               cprintf("%d %s|%s\n", CIT_OK,
+               cprintf("%d %s|%d\n", CIT_OK,
                        ((valid_to != NULL) ? valid_to->display_recp : ""), 
-                        ((CC->room.QRflags2 & QR2_SUBJECTREQ)? 
-                          "SUBJECTREQ" : "SUBJECTOPT") );
+                       subject_required);
                free_recipients(valid_to);
                free_recipients(valid_cc);
                free_recipients(valid_bcc);
@@ -4067,11 +4084,9 @@ void TDAP_AdjRefCount(long msgnum, int incr)
         */
        if (smi.meta_refcount == 0) {
                lprintf(CTDL_DEBUG, "Deleting message <%ld>\n", msgnum);
-
-               /* Remove from fulltext index */
-               if (config.c_enable_fulltext) {
-                       ft_index_message(msgnum, 0);
-               }
+               
+               /* Call delete hooks with NULL room to show it has gone altogether */
+               PerformDeleteHooks(NULL, msgnum);
 
                /* Remove from message base */
                delnum = msgnum;