/*
- * $Id: $
- *
* Message journaling functions.
- *
*/
#include "sysdep.h"
#include <errno.h>
#include <stdarg.h>
#include <sys/stat.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "database.h"
#include "msgbase.h"
#include "support.h"
#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 "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 */
/*
* Hand off a copy of a message to be journalized.
*/
void JournalBackgroundSubmit(struct CtdlMessage *msg,
- char *saved_rfc822_version,
+ StrBuf *saved_rfc822_version,
struct recptypes *recps) {
struct jnlq *jptr = NULL;
/* Avoid double journaling! */
if (msg->cm_fields['J'] != NULL) {
- free(saved_rfc822_version);
+ FreeStrBuf(&saved_rfc822_version);
return;
}
jptr = (struct jnlq *)malloc(sizeof(struct jnlq));
if (jptr == NULL) {
- free(saved_rfc822_version);
+ FreeStrBuf(&saved_rfc822_version);
return;
}
memset(jptr, 0, sizeof(struct jnlq));
if (msg->cm_fields['F'] != NULL) jptr->rfca = strdup(msg->cm_fields['F']);
if (msg->cm_fields['U'] != NULL) jptr->subj = strdup(msg->cm_fields['U']);
if (msg->cm_fields['I'] != NULL) jptr->msgn = strdup(msg->cm_fields['I']);
- jptr->rfc822 = saved_rfc822_version;
+ jptr->rfc822 = SmashStrBuf(&saved_rfc822_version);
/* Add to the queue */
begin_critical_section(S_JOURNAL_QUEUE);
}
+/*
+ * 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 (CtdlGetUser(&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;
- journal_recps = validate_recipients("FIXME@example.com"); /* FIXME */
+ if (jmsg == NULL)
+ return;
+ journal_recps = validate_recipients(config.c_journal_dest, NULL, 0);
if (journal_recps != NULL) {
if ( (journal_recps->num_local > 0)
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);
free(jmsg->msgn);
/* Submit journal message */
- CtdlSubmitMsg(journal_msg, journal_recps, "");
+ CtdlSubmitMsg(journal_msg, journal_recps, "", 0);
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);
projects / citadel.git / blobdiff