Continue phase 2 of modules stuff.

[citadel.git] / citadel / journaling.c

diff --git a/citadel/journaling.c b/citadel/journaling.c
index 7febabd0ae3b2cfbad2d886ad05ea85222636790..f0464a999adca9124bd9673c396e8bc8523048b7 100644 (file)
--- a/citadel/journaling.c
+++ b/citadel/journaling.c
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Message journaling functions.
  *
@@ -31,7 +31,6 @@
 #include <sys/stat.h>
 #include "citadel.h"
 #include "server.h"
-#include "serv_extensions.h"
 #include "database.h"
 #include "msgbase.h"
 #include "support.h"
@@ -48,7 +47,7 @@
 #include "genstamp.h"
 #include "internet_addressing.h"
 #include "vcard.h"
-#include "serv_vcard.h"
+#include "serv_vcard.h"        /* Needed for vcard_getuser and extract_inet_email_addrs */
 #include "journaling.h"
 
 struct jnlq *jnlq = NULL;      /* journal queue */
@@ -93,6 +92,14 @@ void JournalBackgroundSubmit(struct CtdlMessage *msg,
 /*
  * Convert a local user name to an internet email address for the journal
  */
+ 
+/*
+ * TODODRW: change this into a CtdlModuleDo type function that returns alternative address info
+ * for this local user. Something like CtdlModuleGoGetAddr(char *localuser, int type, char *alt_addr, size_t alt_addr_len)
+ * where type can be ADDR_EMAIL, ADDR_FIDO, ADDR_UUCP, ADDR_WEB, ADDR_POSTAL etc etc.
+ * This then begs the question of what should be returned. Is it wise to return a single char* using a comma as a
+ * delimiter? Or would it be better to return a linked list of some kind?
+ */
 void local_to_inetemail(char *inetemail, char *localuser, size_t inetemail_len) {
        struct ctdluser us;
        struct vCard *v;
@@ -107,7 +114,7 @@ void local_to_inetemail(char *inetemail, char *localuser, size_t inetemail_len)
                return;
        }
 
-       extract_inet_email_addrs(inetemail, inetemail_len, NULL, 0, v);
+       extract_inet_email_addrs(inetemail, inetemail_len, NULL, 0, v, 1);
        vcard_free(v);
 }
 
@@ -241,7 +248,7 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
                        CtdlFreeMessage(journal_msg);
                }
 
-               free(journal_recps);
+               free_recipients(journal_recps);
        }
 
        /* We are responsible for freeing this memory. */