* give all commands their own function

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 60648431e3e2c8e100b439a11522bda71cafcd4a..cde4e1eca24b78bd12eff2eb30ced1489059cd9a 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -54,6 +54,8 @@
 #include "serv_network.h"
 #include "threads.h"
 
+#include "ctdl_module.h"
+
 long config_msgnum;
 struct addresses_to_be_filed *atbf = NULL;
 
@@ -1019,7 +1021,12 @@ void mime_spew_section(char *name, char *filename, char *partnum, char *disp,
        ||      (!IsEmptyStr(cbid) && (!strcasecmp(CC->download_desired_section, cbid)))
        ) {
                *found_it = 1;
-               cprintf("%d %d\n", BINARY_FOLLOWS, (int)length);
+               cprintf("%d %d|-1|%s|%s\n",
+                       BINARY_FOLLOWS,
+                       (int)length,
+                       filename,
+                       cbtype
+               );
                client_write(content, length);
        }
 }
@@ -2629,6 +2636,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        int qualified_for_journaling = 0;
        struct CitContext *CCC = CC;            /* CachedCitContext - performance boost */
        char bounce_to[1024] = "";
+       size_t tmp = 0;
 
        CtdlLogPrintf(CTDL_DEBUG, "CtdlSubmitMsg() called\n");
        if (is_valid_message(msg) == 0) return(-1);     /* self check */
@@ -2801,14 +2809,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,     /* message to save */
        }
 
        /* For internet mail, drop a copy in the outbound queue room */
-       if (recps != NULL)
-        if (recps->num_internet > 0) {
+       if ((recps != NULL) && (recps->num_internet > 0)) {
                CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0, msg);
        }
 
        /* If other rooms are specified, drop them there too. */
-       if (recps != NULL)
-        if (recps->num_room > 0)
+       if ((recps != NULL) && (recps->num_room > 0))
          for (i=0; i<num_tokens(recps->recp_room, '|'); ++i) {
                extract_token(recipient, recps->recp_room, i,
                                        '|', sizeof recipient);
@@ -2823,7 +2829,10 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,      /* message to save */
        lputuser(&CCC->user);
 
        /* Decide where bounces need to be delivered */
-       if (CCC->logged_in) {
+       if ((recps != NULL) && (recps->bounce_to != NULL)) {
+               safestrncpy(bounce_to, recps->bounce_to, sizeof bounce_to);
+       }
+       else if (CCC->logged_in) {
                snprintf(bounce_to, sizeof bounce_to, "%s@%s", CCC->user.fullname, config.c_nodename);
        }
        else {
@@ -2833,8 +2842,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        /* If this is private, local mail, make a copy in the
         * recipient's mailbox and bump the reference count.
         */
-       if (recps != NULL)
-        if (recps->num_local > 0)
+       if ((recps != NULL) && (recps->num_local > 0))
          for (i=0; i<num_tokens(recps->recp_local, '|'); ++i) {
                extract_token(recipient, recps->recp_local, i,
                                        '|', sizeof recipient);
@@ -2891,8 +2899,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
         * node.  We'll revisit this again in a year or so when everyone has
         * a network spool receiver that can handle the new style messages.
         */
-       if (recps != NULL)
-        if (recps->num_ignet > 0)
+       if ((recps != NULL) && (recps->num_ignet > 0))
          for (i=0; i<num_tokens(recps->recp_ignet, '|'); ++i) {
                extract_token(recipient, recps->recp_ignet, i,
                                '|', sizeof recipient);
@@ -2934,8 +2941,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
         * not happen because the delivery instructions message does not
         * contain a recipient.
         */
-       if (recps != NULL)
-        if (recps->num_internet > 0) {
+       if ((recps != NULL) && (recps->num_internet > 0)) {
                CtdlLogPrintf(CTDL_DEBUG, "Generating delivery instructions\n");
                instr_alloc = 1024;
                instr = malloc(instr_alloc);
@@ -2946,8 +2952,13 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,      /* message to save */
                        bounce_to
                );
 
+               if (recps->envelope_from != NULL) {
+                       tmp = strlen(instr);
+                       snprintf(&instr[tmp], instr_alloc-tmp, "envelope_from|%s\n", recps->envelope_from);
+               }
+
                for (i=0; i<num_tokens(recps->recp_internet, '|'); ++i) {
-                       size_t tmp = strlen(instr);
+                       tmp = strlen(instr);
                        extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient);
                        if ((tmp + strlen(recipient) + 32) > instr_alloc) {
                                instr_alloc = instr_alloc * 2;
@@ -3679,6 +3690,8 @@ void free_recipients(struct recptypes *valid) {
        if (valid->recp_ignet != NULL)          free(valid->recp_ignet);
        if (valid->recp_room != NULL)           free(valid->recp_room);
        if (valid->display_recp != NULL)        free(valid->display_recp);
+       if (valid->bounce_to != NULL)           free(valid->bounce_to);
+       if (valid->envelope_from != NULL)       free(valid->envelope_from);
        free(valid);
 }
 
@@ -4683,3 +4696,26 @@ void cmd_isme(char *argbuf) {
        }
 
 }
+
+
+/*****************************************************************************/
+/*                      MODULE INITIALIZATION STUFF                          */
+/*****************************************************************************/
+
+CTDL_MODULE_INIT(msgbase)
+{
+       CtdlRegisterProtoHook(cmd_msgs, "MSGS", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_msg0, "MSG0", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_msg2, "MSG2", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_msg3, "MSG3", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_msg4, "MSG4", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_msgp, "MSGP", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_opna, "OPNA", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_dlat, "DLAT", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_ent0, "ENT0", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_dele, "DELE", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_move, "MOVE", "Autoconverted. TODO: document me.");
+       CtdlRegisterProtoHook(cmd_isme, "ISME", "Autoconverted. TODO: document me.");
+        /* return our Subversion id for the Log */
+       return "$Id$";
+}