#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 */
}
+/*
+ * 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_inet_email_addrs(inetemail, inetemail_len, NULL, 0, v, 1);
+ vcard_free(v);
+}
+
+
/*
* Called by JournalRunQueue() to send an individual message.
*/
char *message_text = NULL;
char mime_boundary[256];
char recipient[256];
+ char inetemail[256];
static int seq = 0;
int i;
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"
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);
CtdlFreeMessage(journal_msg);
}
- free(journal_recps);
+ free_recipients(journal_recps);
}
/* We are responsible for freeing this memory. */
* Run the queue.
*/
void JournalRunQueue(void) {
- struct jnlq *jptr;
+ struct jnlq *jptr = NULL;
while (jnlq != NULL) {
begin_critical_section(S_JOURNAL_QUEUE);