* Change to journaling code to include an Internet email address for local

[citadel.git] / citadel / journaling.c

diff --git a/citadel/journaling.c b/citadel/journaling.c
index de685b87b3f33139d9432b8b519a4bb7cf9e4f5f..ec158b43c80999e120a1d02669002900aa6d3acb 100644 (file)
--- a/citadel/journaling.c
+++ b/citadel/journaling.c
@@ -47,6 +47,8 @@
 #include "html.h"
 #include "genstamp.h"
 #include "internet_addressing.h"
+#include "vcard.h"
+#include "serv_vcard.h"
 #include "journaling.h"
 
 struct jnlq *jnlq = NULL;      /* journal queue */
@@ -88,6 +90,28 @@ void JournalBackgroundSubmit(struct CtdlMessage *msg,
 }
 
 
+/*
+ * Convert a local user name to an internet email address for the journal
+ */
+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_primary_inet_email(inetemail, inetemail_len, v);
+       vcard_free(v);
+}
+
+
 /*
  * Called by JournalRunQueue() to send an individual message.
  */
@@ -98,10 +122,11 @@ 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;
 
-       journal_recps = validate_recipients("FIXME@example.com");       /* FIXME */
+       journal_recps = validate_recipients(config.c_journal_dest);
        if (journal_recps != NULL) {
 
                if (  (journal_recps->num_local > 0)
@@ -128,8 +153,15 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
                        sprintf(mime_boundary, "--Citadel-Journal-%08lx-%04x--", time(NULL), ++seq);
                        message_text = malloc(strlen(jmsg->rfc822) + sizeof(struct recptypes) + 1024);
 
+                       /*
+                        * Here is where we begin to compose the journalized message.
+                        * NOTE: the superfluous "Content-Identifer: ExJournalReport" header was
+                        *       requested by a paying customer, and yes, it is intentionally
+                        *       spelled wrong.  Do NOT remove or change it.
+                        */
                        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"
@@ -159,27 +191,28 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
                                jmsg->msgn
                        );
 
-                       if (journal_recps->num_local > 0) {
-                               for (i=0; i<journal_recps->num_local; ++i) {
-                                       extract_token(recipient, journal_recps->recp_local,
+                       if (jmsg->recps.num_local > 0) {
+                               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);
                                }
                        }
 
-                       if (journal_recps->num_ignet > 0) {
-                               for (i=0; i<journal_recps->num_ignet; ++i) {
-                                       extract_token(recipient, journal_recps->recp_ignet,
+                       if (jmsg->recps.num_ignet > 0) {
+                               for (i=0; i<jmsg->recps.num_ignet; ++i) {
+                                       extract_token(recipient, jmsg->recps.recp_ignet,
                                                        i, '|', sizeof recipient);
                                        sprintf(&message_text[strlen(message_text)],
                                                "       %s\r\n", recipient);
                                }
                        }
 
-                       if (journal_recps->num_internet > 0) {
-                               for (i=0; i<journal_recps->num_internet; ++i) {
-                                       extract_token(recipient, journal_recps->recp_internet,
+                       if (jmsg->recps.num_internet > 0) {
+                               for (i=0; i<jmsg->recps.num_internet; ++i) {
+                                       extract_token(recipient, jmsg->recps.recp_internet,
                                                        i, '|', sizeof recipient);
                                        sprintf(&message_text[strlen(message_text)],
                                                "       %s\r\n", recipient);
@@ -220,7 +253,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);