A few more API clean ups. Mainly revolving around user_ops.c

[citadel.git] / citadel / journaling.c

diff --git a/citadel/journaling.c b/citadel/journaling.c
index 4d18623c57e838f10145abfd40a8862842608dc5..80122f25ab76865d751fb731df60503c74c00b96 100644 (file)
--- a/citadel/journaling.c
+++ b/citadel/journaling.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <sys/stat.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "database.h"
@@ -41,15 +42,14 @@
 #include "file_ops.h"
 #include "config.h"
 #include "control.h"
-#include "tools.h"
-#include "mime_parser.h"
-#include "html.h"
 #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"
 
+#include "ctdl_module.h"
+#include "threads.h"
+
 struct jnlq *jnlq = NULL;      /* journal queue */
 
 /*
@@ -92,12 +92,20 @@ 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;
 
        strcpy(inetemail, "");
-       if (getuser(&us, localuser) != 0) {
+       if (CtdlGetUser(&us, localuser) != 0) {
                return;
        }
 
@@ -125,7 +133,7 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
        static int seq = 0;
        int i;
 
-       journal_recps = validate_recipients(config.c_journal_dest);
+       journal_recps = validate_recipients(config.c_journal_dest, NULL, 0);
        if (journal_recps != NULL) {
 
                if (  (journal_recps->num_local > 0)
@@ -236,7 +244,7 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
                        free(jmsg->msgn);
                        
                        /* Submit journal message */
-                       CtdlSubmitMsg(journal_msg, journal_recps, "");
+                       CtdlSubmitMsg(journal_msg, journal_recps, "", 0);
                        CtdlFreeMessage(journal_msg);
                }