Continue phase 2 of modules stuff.

[citadel.git] / citadel / journaling.c

diff --git a/citadel/journaling.c b/citadel/journaling.c
index f45d601c6fcc054b2b9d4388e744945a843011fe..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"
@@ -47,6 +46,8 @@
 #include "html.h"
 #include "genstamp.h"
 #include "internet_addressing.h"
+#include "vcard.h"
+#include "serv_vcard.h"        /* Needed for vcard_getuser and extract_inet_email_addrs */
 #include "journaling.h"
 
 struct jnlq *jnlq = NULL;      /* journal queue */
@@ -88,6 +89,36 @@ 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) {
+               return;
+       }
+
+       v = vcard_get_user(&us);
+       if (v == NULL) {
+               return;
+       }
+
+       extract_inet_email_addrs(inetemail, inetemail_len, NULL, 0, v, 1);
+       vcard_free(v);
+}
+
+
 /*
  * Called by JournalRunQueue() to send an individual message.
  */
@@ -98,6 +129,7 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
        char *message_text = NULL;
        char mime_boundary[256];
        char recipient[256];
+       char inetemail[256];
        static int seq = 0;
        int i;
 
@@ -136,11 +168,11 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
                         */
                        sprintf(message_text,
                                "Content-type: multipart/mixed; boundary=\"%s\"\r\n"
+                               "Content-Identifer: ExJournalReport\r\n"
                                "MIME-Version: 1.0\r\n"
                                "\n"
                                "--%s\r\n"
                                "Content-type: text/plain\r\n"
-                               "Content-Identifer: ExJournalReport\r\n"
                                "\r\n"
                                "Sender: %s "
                        ,
@@ -170,8 +202,9 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
                                for (i=0; i<jmsg->recps.num_local; ++i) {
                                        extract_token(recipient, jmsg->recps.recp_local,
                                                        i, '|', sizeof recipient);
+                                       local_to_inetemail(inetemail, recipient, sizeof inetemail);
                                        sprintf(&message_text[strlen(message_text)],
-                                               "       %s\r\n", recipient);
+                                               "       %s <%s>\r\n", recipient, inetemail);
                                }
                        }
 
@@ -215,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. */
@@ -227,7 +260,7 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
  * Run the queue.
  */
 void JournalRunQueue(void) {
-       struct jnlq *jptr;
+       struct jnlq *jptr = NULL;
 
        while (jnlq != NULL) {
                begin_critical_section(S_JOURNAL_QUEUE);